Commit cf6775ee authored Aug 06, 2014 by Mathieu Chartier

Fix JNI error in exception reporting.

There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627
Change-Id: Ie4f9f9a5f8b7993cd3655d42a6718c0a5e1199f8

parent 8b8c718c

core/jni/android_util_Binder.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,10 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
		env->ExceptionClear();

		jstring tagstr = env->NewStringUTF(LOG_TAG);
		jstring msgstr = env->NewStringUTF(msg);
		jstring msgstr = NULL;
		if (tagstr != NULL) {
		msgstr = env->NewStringUTF(msg);
		}

		if ((tagstr == NULL) \|\| (msgstr == NULL)) {
		env->ExceptionClear(); /* assume exception (OOM?) was thrown */