diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-04-17 17:19:30 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-17 17:19:30 +0000 |
| commit | 1dbfe996b946f0d2a1afc52669ff5fca22a85070 (patch) | |
| tree | f4037b8c4c46725a9c73276f9c58cd78883b79dc /fxjs/cjs_publicmethods.cpp | |
| parent | 2617056df6d6e1d0f17031f0c9db09f9192cb0fa (diff) | |
| download | pdfium-1dbfe996b946f0d2a1afc52669ff5fca22a85070.tar.xz | |
Re-land "Return pdfium::span<char> from ByteString::GetBuffer().""
This reverts commit 3d523e3cf89440e2ffc6571b1c687ad5e3f0318f.
Fixes bounding errors now caught by tests.
Change-Id: I4d0f1791bdcc45a10615a62abf7a4d20e7e538f2
Reviewed-on: https://pdfium-review.googlesource.com/30799
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/cjs_publicmethods.cpp')
| -rw-r--r-- | fxjs/cjs_publicmethods.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp index 375eb6fd88..8dc69c4a00 100644 --- a/fxjs/cjs_publicmethods.cpp +++ b/fxjs/cjs_publicmethods.cpp @@ -10,6 +10,7 @@ #include <cmath> #include <cwctype> #include <iomanip> +#include <iterator> #include <limits> #include <sstream> #include <string> @@ -1094,10 +1095,12 @@ CJS_Return CJS_PublicMethods::AFPercent_Format( if (iDec2 < 0) { ByteString zeros; - char* zeros_ptr = zeros.GetBuffer(abs(iDec2)); - memset(zeros_ptr, '0', abs(iDec2)); + { + pdfium::span<char> zeros_ptr = zeros.GetBuffer(abs(iDec2)); + std::fill(std::begin(zeros_ptr), std::end(zeros_ptr), '0'); + } + zeros.ReleaseBuffer(abs(iDec2)); strValue = zeros + strValue; - iDec2 = 0; } int iMax = strValue.GetLength(); |