diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-15 10:59:10 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-15 18:52:39 +0000 |
| commit | 1c5bf6bf57b13e6ddde8995d6648bfb69d06f1c4 (patch) | |
| tree | 64d7bbc2e01248c8482e6c8597e9322f953b5d78 /core/fxcrt/fx_arabic.cpp | |
| parent | 0029fb25b9b69f2e4465164282eb1040b60437dd (diff) | |
| download | pdfium-1c5bf6bf57b13e6ddde8995d6648bfb69d06f1c4.tar.xz | |
Fix botch introduced at 193e6ca, try 2.
Change-Id: I9eb6e8c621b0562413873ac67b362efa68fc3ab8
Reviewed-on: https://pdfium-review.googlesource.com/3061
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/fx_arabic.cpp')
| -rw-r--r-- | core/fxcrt/fx_arabic.cpp | 6 |
1 files 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<int32_t>(*chars)); + ASSERT(iCount >= 0 && + iStart + iCount <= pdfium::CollectionSize<int32_t>(*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<int32_t>(*chars)); ASSERT(iStart - iCount > -1); int32_t iLast = iStart - iCount; if (bClass) { |