From 1c5bf6bf57b13e6ddde8995d6648bfb69d06f1c4 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 15 Mar 2017 10:59:10 -0700 Subject: Fix botch introduced at 193e6ca, try 2. Change-Id: I9eb6e8c621b0562413873ac67b362efa68fc3ab8 Reviewed-on: https://pdfium-review.googlesource.com/3061 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fxcrt/fx_arabic.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp index 70e8e6a709..f197af5e13 100644 --- a/core/fxcrt/fx_arabic.cpp +++ b/core/fxcrt/fx_arabic.cpp @@ -399,8 +399,8 @@ class CFX_BidiLine { int32_t iStart, int32_t iCount) { ASSERT(pdfium::IndexInBounds(*chars, iStart)); - ASSERT(pdfium::IndexInBounds(*chars, iCount)); - ASSERT(iStart + iCount <= pdfium::CollectionSize(*chars)); + ASSERT(iCount >= 0 && + iStart + iCount <= pdfium::CollectionSize(*chars)); std::reverse(chars->begin() + iStart, chars->begin() + iStart + iCount); } @@ -409,7 +409,7 @@ class CFX_BidiLine { int32_t iStart, int32_t iCount, int32_t iValue) { - ASSERT(pdfium::IndexInBounds(*chars, iStart)); + ASSERT(iStart >= 0 && iStart <= pdfium::CollectionSize(*chars)); ASSERT(iStart - iCount > -1); int32_t iLast = iStart - iCount; if (bClass) { -- cgit v1.2.3