commit 5e44f5cc0c2824827c9e87daff83e9722c549345
author Nick Kralevich <nnk@google.com> Fri Aug 28 17:28:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 17:28:37 2015 +0000
tree 8dc04a0adddd6d79a9e8f5d4be6864f67fb660b0
parent 35cee267338c5b290dff99365cc734aa60e0f773
parent 2c58af52232f0c8b4ab09d75eba66d1283805cab

am 2c58af52: Merge "VectorImpl.cpp: fix benign multiplication overflow"

* commit '2c58af52232f0c8b4ab09d75eba66d1283805cab':
  VectorImpl.cpp: fix benign multiplication overflow

libutils/VectorImpl.cpp

diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp
index bdb54b1..2f770f5 100644
--- a/libutils/VectorImpl.cpp
+++ b/libutils/VectorImpl.cpp
@@ -198,7 +198,10 @@
                     _do_copy(next, curr, 1);
                     next = curr;
                     --j;
-                    curr = reinterpret_cast<char*>(array) + mItemSize*(j);                    
+                    curr = NULL;
+                    if (j >= 0) {
+                        curr = reinterpret_cast<char*>(array) + mItemSize*(j);
+                    }
                 } while (j>=0 && (cmp(curr, temp, state) > 0));
 
                 _do_destroy(next, 1);