commit abf3ef8206de388c7fc5f529f3ee05419475b651
author Ben Cheng <bccheng@android.com> Tue Nov 23 11:55:16 2010 -0800
committer Ben Cheng <bccheng@android.com> Tue Nov 23 11:55:16 2010 -0800
tree bc1f83a5c7721e8a050f73939be9e32ee0658279
parent 72ef412b56becfbdd54f239ea672a48b163ff1d2

Fix off-by-1 bug in expandable bit vectors.

Bug: 3224068
Change-Id: I6e5e956da380262e65cb1da9bcc51ba31f5b0d14

vm/compiler/Utility.c

diff --git a/vm/compiler/Utility.c b/vm/compiler/Utility.c
index 711d4cf..daeb893 100644
--- a/vm/compiler/Utility.c
+++ b/vm/compiler/Utility.c
@@ -277,7 +277,8 @@
         if (!pBits->expandable)
             return false;
 
-        int newSize = (num + 31) >> 5;
+        /* Round up to word boundaries for "num+1" bits */
+        int newSize = (num + 1 + 31) >> 5;
         assert(newSize > pBits->storageSize);
         u4 *newStorage = dvmCompilerNew(newSize * sizeof(u4), false);
         memcpy(newStorage, pBits->storage, pBits->storageSize * sizeof(u4));