From 57cb5447d68c01eddba0618c3a8fe450b180f917 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Fri, 1 Sep 2017 11:14:18 -0400 Subject: Adjust loops in preperation for FX_STRSIZE int->size_t Adjust loop conditions and behaviours in preperation for convering the underlying type of FX_STRSIZE to size_t. These changes are not dependent on the type switch occuring, so can be landed before hand. BUG=pdfium:828 Change-Id: I5f950c99c10e5ef0836959e3b1dd2e09f8f5afc0 Reviewed-on: https://pdfium-review.googlesource.com/12750 Commit-Queue: Ryan Harrison Reviewed-by: Henrique Nakashima --- fpdfsdk/javascript/Document.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index d5875aca69..77f67b5c8f 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -1016,16 +1016,17 @@ bool Document::documentFileName(CJS_Runtime* pRuntime, return false; } CFX_WideString wsFilePath = m_pFormFillEnv->JS_docGetFilePath(); - FX_STRSIZE i = wsFilePath.GetLength() - 1; - for (; i >= 0; i--) { - if (wsFilePath[i] == L'\\' || wsFilePath[i] == L'/') + FX_STRSIZE i = wsFilePath.GetLength(); + for (; i > 0; i--) { + if (wsFilePath[i - 1] == L'\\' || wsFilePath[i - 1] == L'/') break; } - if (i >= 0 && i < wsFilePath.GetLength() - 1) { - vp << (wsFilePath.GetBuffer(wsFilePath.GetLength()) + i + 1); - } else { + + if (i > 0 && i < wsFilePath.GetLength()) + vp << (wsFilePath.GetBuffer(wsFilePath.GetLength()) + i); + else vp << L""; - } + return true; } -- cgit v1.2.3