From 61cb1121729d7e5f53c95077dcc57a61b3f575e8 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 28 Aug 2017 13:36:18 -0400 Subject: Convert find markers to Optionals in CPDF_TextPageFind Currently these use -1 as a special value to indicate not set. This creates the same issues that FX_STRNPOS created for converting FX_STRSIZE to size_t, so this code has been rewritten. BUG=pdfium:828 Change-Id: Iaaa96af0dcb2eb8b600f3ea39060a398ac9a3800 Reviewed-on: https://pdfium-review.googlesource.com/12130 Reviewed-by: Tom Sepez Commit-Queue: Ryan Harrison --- fpdfsdk/fpdftext.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 2ea06de5d8..8ed76ea7c1 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -250,7 +250,9 @@ FPDFText_FindStart(FPDF_TEXTPAGE text_page, new CPDF_TextPageFind(CPDFTextPageFromFPDFTextPage(text_page)); FX_STRSIZE len = CFX_WideString::WStringLength(findwhat); textpageFind->FindFirst(CFX_WideString::FromUTF16LE(findwhat, len), flags, - start_index); + start_index >= 0 + ? pdfium::Optional(start_index) + : pdfium::Optional()); return textpageFind; } -- cgit v1.2.3