Merge remote-tracking branch 'upstream/cm-12.1' into brn-12.1

Author: Jenkins

dalvik/src/main/java/dalvik/system/ZygoteHooks.java

@@ -38,6 +38,7 @@ public void preFork() {
         Daemons.stop();
         waitUntilAllThreadsStopped();
         token = nativePreFork();
+        System.closeLogSockets();
     }
 
     /**

luni/src/main/java/java/lang/System.java

@@ -1101,6 +1101,9 @@ public static void setSecurityManager(SecurityManager sm) {
         }
     }
 
+    /** @hide */
+    public static native void closeLogSockets();
+
     /**
      * Returns the platform specific file name format for the shared library
      * named by the argument. On Android, this would turn {@code "MyLibrary"} into

luni/src/main/native/java_lang_System.cpp

@@ -62,6 +62,10 @@ static void System_log(JNIEnv* env, jclass, jchar type, jstring javaMessage, jth
     }
 }
 
+static void System_closeLogSockets(JNIEnv*, jclass) {
+  __android_log_close();
+}
+
 // Sets a field via JNI. Used for the standard streams, which are read-only otherwise.
 static void System_setFieldImpl(JNIEnv* env, jclass clazz,
         jstring javaName, jstring javaSignature, jobject object) {
@@ -133,6 +137,7 @@ static jstring System_mapLibraryName(JNIEnv* env, jclass, jstring javaName) {
 }
 
 static JNINativeMethod gMethods[] = {
+    NATIVE_METHOD(System, closeLogSockets, "()V"),
     NATIVE_METHOD(System, currentTimeMillis, "!()J"),
     NATIVE_METHOD(System, log, "(CLjava/lang/String;Ljava/lang/Throwable;)V"),
     NATIVE_METHOD(System, mapLibraryName, "(Ljava/lang/String;)Ljava/lang/String;"),

luni/src/main/native/libcore_icu_NativeIDN.cpp

@@ -37,11 +37,12 @@ static jstring NativeIDN_convertImpl(JNIEnv* env, jclass, jstring javaSrc, jint
     if (src.get() == NULL) {
         return NULL;
     }
-    UChar dst[256];
+    static const size_t kDstSize = 512;
+    UChar dst[kDstSize];
     UErrorCode status = U_ZERO_ERROR;
     size_t resultLength = toAscii
-        ? uidna_IDNToASCII(src.get(), src.size(), &dst[0], sizeof(dst), flags, NULL, &status)
-        : uidna_IDNToUnicode(src.get(), src.size(), &dst[0], sizeof(dst), flags, NULL, &status);
+        ? uidna_IDNToASCII(src.get(), src.size(), &dst[0], kDstSize, flags, NULL, &status)
+        : uidna_IDNToUnicode(src.get(), src.size(), &dst[0], kDstSize, flags, NULL, &status);
     if (U_FAILURE(status)) {
         jniThrowException(env, "java/lang/IllegalArgumentException", u_errorName(status));
         return NULL;

luni/src/test/java/libcore/java/net/IDNTest.java

@@ -37,4 +37,15 @@ public void test_toUnicode_failures() {
         String longInput = makePunyString(512);
         assertEquals(longInput, IDN.toUnicode(longInput));
     }
+
+    // http://b/30765246
+    public void testLongDomainName() {
+        String label63 = "123456789-123456789-123456789-123456789-123456789-123456789-123";
+        String host255 = label63 + "." + label63 + "." + label63 + "." + label63;
+        try {
+            IDN.toASCII(host255.substring(3) + ".com");
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
 }