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

* commit '6b86f3fe304c7aa4f2c629a1cacd84428aad9a3e':
  VectorImpl.cpp: fix benign multiplication overflow
This commit is contained in:
Nick Kralevich 2015-08-28 17:46:51 +00:00 committed by Android Git Automerger
commit 63e5142283

View file

@ -198,7 +198,10 @@ status_t VectorImpl::sort(VectorImpl::compar_r_t cmp, void* state)
_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);