summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-09-26 13:25:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-09-26 13:25:26 +0000
commit6f7665370b368b3f4164cdce501ae224b3351c9b (patch)
treece082ed44b5e1fa0641a880ad5658232ee3c145e
parentc3838f85ecd1d646840415b7155922e2b55ec1b9 (diff)
parent7d116d7a13173dc2e52cfde5835dd6237e106ed8 (diff)
Merge "XmlBlock: if you want to check the result of new, you need nothrow new." into main
-rw-r--r--core/jni/android_util_XmlBlock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp
index 5a444bb1d0ff..c364451057bc 100644
--- a/core/jni/android_util_XmlBlock.cpp
+++ b/core/jni/android_util_XmlBlock.cpp
@@ -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;