From ff2a52cab523bc9de526f97bc060300e55f4506b Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Fri, 10 Nov 2017 19:04:33 +0000 Subject: [Merge M63] Make sure that iterator stays in bounds during IsHypen TBR=dsinclair@chromium.org BUG=chromium:782596,chromium:781804 Change-Id: I020be3cf813221bb8314f045d83014a25cb9a950 Reviewed-on: https://pdfium-review.googlesource.com/18070 Reviewed-by: dsinclair Commit-Queue: dsinclair Reviewed-on: https://pdfium-review.googlesource.com/18350 Reviewed-by: Ryan Harrison Commit-Queue: Ryan Harrison --- core/fpdftext/cpdf_textpage.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp index 0a7a39fff5..d528c6994f 100644 --- a/core/fpdftext/cpdf_textpage.cpp +++ b/core/fpdftext/cpdf_textpage.cpp @@ -1226,20 +1226,17 @@ bool CPDF_TextPage::IsHyphen(wchar_t curChar) const { return false; auto iter = curText.rbegin(); - for (; iter != curText.rend() && *iter == 0x20; iter++) { + for (; (iter + 1) != curText.rend() && *iter == 0x20; iter++) { // Do nothing } - if (iter != curText.rend()) { - if (!IsHyphenCode(*iter)) - return false; + if (!IsHyphenCode(*iter)) + return false; + + if ((iter + 1) != curText.rend()) { iter++; if (FXSYS_iswalpha(*iter) && FXSYS_iswalpha(*iter)) return true; - } else { - iter--; - if (!IsHyphenCode(*iter)) - return false; } const PAGECHAR_INFO* preInfo; -- cgit v1.2.3