diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-05-14 18:24:40 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-14 18:24:40 +0000 |
| commit | 77c223be193b303b833053a757a2f1f2534da610 (patch) | |
| tree | 6616209c2e4b804169708185cd50428662db359c /xfa/fxfa/fm2js/cxfa_fmlexer.cpp | |
| parent | ff3d00d703dd0273922fbae12d0ee50a14667657 (diff) | |
| download | pdfium-77c223be193b303b833053a757a2f1f2534da610.tar.xz | |
Use internal wcstof instead of system wcstod in formcalc lexer
This CL switches the usage of wcstod to use the FXSYS_wcstof to
determine if a given string is a valid floating point number.
Using the internal method makes linux slightly slower (10's of ms)
makes mac a lot faster 900ms to 60ms for the test case in the bug.
The FXSYS_wcstof method has been extended to handle the parsing of
float exponents. Unittests were added for FXSYS_wcstof.
Bug: chromium:813646
Change-Id: Ie68287a336e3b95a0c0b845d5bf39db6fc82b39c
Reviewed-on: https://pdfium-review.googlesource.com/32510
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/fm2js/cxfa_fmlexer.cpp')
| -rw-r--r-- | xfa/fxfa/fm2js/cxfa_fmlexer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp index 32e29575c5..3a694675b7 100644 --- a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp @@ -303,10 +303,12 @@ CXFA_FMToken CXFA_FMLexer::NextToken() { CXFA_FMToken CXFA_FMLexer::AdvanceForNumber() { // This will set end to the character after the end of the number. - wchar_t* end = nullptr; + int32_t used_length = 0; if (m_cursor) - wcstod(const_cast<wchar_t*>(m_cursor), &end); - if (!end || FXSYS_iswalpha(*end)) { + FXSYS_wcstof(const_cast<wchar_t*>(m_cursor), -1, &used_length); + + const wchar_t* end = m_cursor + used_length; + if (used_length == 0 || !end || FXSYS_iswalpha(*end)) { RaiseError(); return CXFA_FMToken(); } |