Merge "XmlBlock: if you want to check the result of new, you need nothrow new." into main (6f766537) · Commits · e / os / android_frameworks_base

core/jni/android_util_XmlBlock.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ static jlong android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobjec
		return 0;
		}

		ResXMLParser* st = new ResXMLParser(*osb);
		ResXMLParser* st = new(std::nothrow) ResXMLParser(*osb);
		if (st == NULL) {
		jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
		return 0;