commit 30e4bf7513f249bc9dd0429b852bbfe1f2739571
author Nick Kralevich <nnk@google.com> Fri Aug 28 17:38:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 17:38:06 2015 +0000
tree 7718a3bd091b3b0d9ec4d3cfe416e23ac79af67b
parent 7d776143efb216cf4edfcd50a69668aef331df2a
parent 5806864ecff6fc41fb2dff5e5e409052a2111bc9

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

* commit '5e44f5cc0c2824827c9e87daff83e9722c549345':
  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);