commit eb629fc78dcc6d1c931bde2b3b4006f09b6373e0
author Jeff Brown <jeffbrown@google.com> Thu Jul 14 16:52:10 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 14 16:52:10 2011 -0700
tree fa392c2e074f53876e4fa9438f78acfc5146787b
parent a2fd1773ba9d2c2e1ae6bff770b0f314e2035547
parent 686f62fcaf4ce2f48d662fa89fb2e84ee9339c4d

Merge "Replace Vector _grow/_shrink checks with assert."

libs/utils/VectorImpl.cpp

diff --git a/libs/utils/VectorImpl.cpp b/libs/utils/VectorImpl.cpp
index 87ae3d5..0701a51 100644
--- a/libs/utils/VectorImpl.cpp
+++ b/libs/utils/VectorImpl.cpp
@@ -347,9 +347,10 @@
 //    LOGV("_grow(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
 //        this, (int)where, (int)amount, (int)mCount, (int)capacity());
 
-    if (where > mCount)
-        where = mCount;
-      
+    LOG_ASSERT(where <= mCount,
+            "[%p] _grow: where=%d, amount=%d, count=%d",
+            this, (int)where, (int)amount, (int)mCount); // caller already checked
+
     const size_t new_size = mCount + amount;
     if (capacity() < new_size) {
         const size_t new_capacity = max(kMinVectorCapacity, ((new_size*3)+1)/2);
@@ -400,8 +401,9 @@
 //    LOGV("_shrink(this=%p, where=%d, amount=%d) count=%d, capacity=%d",
 //        this, (int)where, (int)amount, (int)mCount, (int)capacity());
 
-    if (where >= mCount)
-        where = mCount - amount;
+    LOG_ASSERT(where + amount <= mCount,
+            "[%p] _shrink: where=%d, amount=%d, count=%d",
+            this, (int)where, (int)amount, (int)mCount); // caller already checked
 
     const size_t new_size = mCount - amount;
     if (new_size*3 < capacity()) {