| commit | feff969e03eb5cd45bdf83d3a17ba94971f50cbf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 26 14:19:29 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 26 14:19:29 2024 +0000 |
| tree | d5882d1c277eb00eb4ce2eb936c847253000e8f2 | |
| parent | 3f16532b32bb3931c02d58a731e834e040a15b1f [diff] | |
| parent | 0d02bf7714d1fa2116be6494a9b0105374a760bf [diff] |
Merge "XmlBlock: if you want to check the result of new, you need nothrow new." into main am: 6f7665370b am: 0d02bf7714 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3274312 Change-Id: Ia269752577f456650b203f28bb5f4d081f34af67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp index 5a444bb..c364451 100644 --- a/core/jni/android_util_XmlBlock.cpp +++ b/core/jni/android_util_XmlBlock.cpp
@@ -83,7 +83,7 @@ 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;