commit bd74b4b51f16e200854e41bbbe5ee6afb3af4cff
author Andy McFadden <fadden@android.com> Wed Sep 22 12:37:49 2010 -0700
committer Andy McFadden <fadden@android.com> Wed Sep 22 12:37:49 2010 -0700
tree b12a485cab99e8812a516914def076723daefd3d
parent 4abedd83f88c84fae2a92b15c96709801203e9a8

Fix getExceptionMessage().

dvmAddTrackedAlloc() doesn't like NULL objects.

Bug 3023981.

Change-Id: I181e4dab841b063d9e2f450292732d808e70aaba

vm/Exception.c

diff --git a/vm/Exception.c b/vm/Exception.c
index 35151f2..ddb84e5 100644
--- a/vm/Exception.c
+++ b/vm/Exception.c
@@ -1261,7 +1261,8 @@
 
         dvmCallMethod(self, getMessageMethod, exception, &result);
         messageStr = (StringObject*) result.l;
-        dvmAddTrackedAlloc((Object*) messageStr, self);
+        if (messageStr != NULL)
+            dvmAddTrackedAlloc((Object*) messageStr, self);
 
         dvmChangeStatus(self, oldStatus);
     } else {