diff options
author | Mathieu Chartier <mathieuc@google.com> | 2013-12-04 15:11:12 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2014-05-01 19:21:36 -0700 |
commit | 169bd57177449ba6f9ee62eb01bf49e99522c221 (patch) | |
tree | b06418440d32f041b1f1155be6e1582803a127f7 | |
parent | c32e5ea685dae78fa0883db35d02ffd3daf94665 (diff) | |
download | android_dalvik-169bd57177449ba6f9ee62eb01bf49e99522c221.tar.gz android_dalvik-169bd57177449ba6f9ee62eb01bf49e99522c221.tar.bz2 android_dalvik-169bd57177449ba6f9ee62eb01bf49e99522c221.zip |
Use RETURN_PTR(NULL) instead of RETURN_VOID in newNonMovableArray.
RETURN_VOID doesn't set the return value. This means that we are
returning random garbage when the allocation doesn't succeed.
Bug: 11971220
Change-Id: I570562c7bb9dc573161294916f582709774b35fd
-rw-r--r-- | vm/native/dalvik_system_VMRuntime.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/native/dalvik_system_VMRuntime.cpp b/vm/native/dalvik_system_VMRuntime.cpp index 69f9adb43..cd577c1e1 100644 --- a/vm/native/dalvik_system_VMRuntime.cpp +++ b/vm/native/dalvik_system_VMRuntime.cpp @@ -136,11 +136,11 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args, if (elementClass == NULL) { dvmThrowNullPointerException("elementClass == null"); - RETURN_VOID(); + RETURN_PTR(NULL); } if (length < 0) { dvmThrowNegativeArraySizeException(length); - RETURN_VOID(); + RETURN_PTR(NULL); } // TODO: right now, we don't have a copying collector, so there's no need @@ -152,7 +152,7 @@ static void Dalvik_dalvik_system_VMRuntime_newNonMovableArray(const u4* args, ALLOC_NON_MOVING); if (newArray == NULL) { assert(dvmCheckException(dvmThreadSelf())); - RETURN_VOID(); + RETURN_PTR(NULL); } dvmReleaseTrackedAlloc((Object*) newArray, NULL); |