commit 2c58af52232f0c8b4ab09d75eba66d1283805cab
author Nick Kralevich <nnk@google.com> Fri Aug 28 16:54:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 28 16:54:02 2015 +0000
tree eab0b7bfc934e0fa93028a65a353cafa0834123c
parent f4355868cbce0713331bbb04b063515d6de4c795
parent c76698f24e785a8984fa9d9d0bf8f81aa28746cc

Merge "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);