diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-03-09 17:46:50 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-09 17:46:50 +0000 |
| commit | 69da36c5f841e8c6e5ded6c704d9ef58c57d532a (patch) | |
| tree | 42f50adb5d062f3971f8c6a4f899e737f5462c6c /core/fxcrt/css | |
| parent | 3baef5c6daf58cec2df193714b5727802d0bd42e (diff) | |
| download | pdfium-69da36c5f841e8c6e5ded6c704d9ef58c57d532a.tar.xz | |
Explicitly mark helper methods that only operate on ASCII ranges
A number of our character helper methods take in wide character types,
but only do tests/operations on the ASCII range of characters. As a
very quick first pass I am renaming all of the foot-gun methods to
explictly call out this behaviour, while I do a bigger
cleanup/refactor.
BUG=pdfium:1035
Change-Id: Ia035dfa1cb6812fa6d45155c4565475032c4c165
Reviewed-on: https://pdfium-review.googlesource.com/28330
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/css')
| -rw-r--r-- | core/fxcrt/css/cfx_cssselector.cpp | 4 | ||||
| -rw-r--r-- | core/fxcrt/css/cfx_csssyntaxparser.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fxcrt/css/cfx_cssselector.cpp b/core/fxcrt/css/cfx_cssselector.cpp index 3993dcae5c..76cb846890 100644 --- a/core/fxcrt/css/cfx_cssselector.cpp +++ b/core/fxcrt/css/cfx_cssselector.cpp @@ -17,7 +17,7 @@ int32_t GetCSSNameLen(const wchar_t* psz, const wchar_t* pEnd) { const wchar_t* pStart = psz; while (psz < pEnd) { wchar_t wch = *psz; - if (!FXSYS_iswalnum(wch) && wch != '_' && wch != '-') + if (!FXSYS_iswASCIIalnum(wch) && wch != '_' && wch != '-') break; ++psz; } @@ -67,7 +67,7 @@ std::unique_ptr<CFX_CSSSelector> CFX_CSSSelector::FromString( std::unique_ptr<CFX_CSSSelector> pFirst = nullptr; for (psz = pStart; psz < pEnd;) { wchar_t wch = *psz; - if (FXSYS_iswalpha(wch) || wch == '*') { + if (FXSYS_iswASCIIalpha(wch) || wch == '*') { int32_t iNameLen = wch == '*' ? 1 : GetCSSNameLen(psz, pEnd); auto p = pdfium::MakeUnique<CFX_CSSSelector>(CFX_CSSSelectorType::Element, psz, iNameLen, true); diff --git a/core/fxcrt/css/cfx_csssyntaxparser.cpp b/core/fxcrt/css/cfx_csssyntaxparser.cpp index 30352a5a20..fea951f1ec 100644 --- a/core/fxcrt/css/cfx_csssyntaxparser.cpp +++ b/core/fxcrt/css/cfx_csssyntaxparser.cpp @@ -18,7 +18,7 @@ namespace { bool IsSelectorStart(wchar_t wch) { - return wch == '.' || wch == '#' || wch == '*' || FXSYS_iswalpha(wch); + return wch == '.' || wch == '#' || wch == '*' || FXSYS_iswASCIIalpha(wch); } } // namespace |