commit 3489e504b34dff8140df7b888a7d1340fc83fc26
author Andy McFadden <fadden@android.com> Tue Oct 19 12:02:25 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 19 12:02:25 2010 -0700
tree b0dc544ea7dcbd97df9d38e0ebf5807b4f4c48f6
parent 651ff81c30cc9916fc9bfb39adff7a4e6d2de6aa
parent 6440496a8320c8e7f3d489d87ce2da2788a3996c

Merge "Update heap dump notes." into dalvik-dev

vm/alloc/CardTable.c

diff --git a/vm/alloc/CardTable.c b/vm/alloc/CardTable.c
index cc344a8..9e3677b 100644
--- a/vm/alloc/CardTable.c
+++ b/vm/alloc/CardTable.c
@@ -167,9 +167,12 @@
     assert(addr != NULL);
     assert(arg != NULL);
     obj = *(Object **)addr;
+    if (obj == NULL) {
+        return;
+    }
     assert(dvmIsValidObject(obj));
     ctx = arg;
-    if (obj == NULL || dvmHeapBitmapIsObjectBitSet(ctx->markBits, obj)) {
+    if (dvmHeapBitmapIsObjectBitSet(ctx->markBits, obj)) {
         return;
     }
     ctx->whiteRefs += 1;