diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-11 16:20:32 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-11 21:03:14 +0000 |
| commit | ddb9b7cdd19b63a81c4a094239e85f84acefaa17 (patch) | |
| tree | 8657940fb10d76a96ffe996cf17d70a1c65ca6de /core/fxcrt/cfx_widestring.cpp | |
| parent | d27998f6526272a5b8732106aa9b75f724434aca (diff) | |
| download | pdfium-ddb9b7cdd19b63a81c4a094239e85f84acefaa17.tar.xz | |
Add checks of index operations on string classes
Specifically the index parameter passed in to GetAt(), SetAt() and
operator[] are now being tested to be in bounds.
BUG=chromium:752480, pdfium:828
Change-Id: I9e94d58c98a8eaaaae53cd0e3ffe2123ea17d8c4
Reviewed-on: https://pdfium-review.googlesource.com/10651
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_widestring.cpp')
| -rw-r--r-- | core/fxcrt/cfx_widestring.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/core/fxcrt/cfx_widestring.cpp b/core/fxcrt/cfx_widestring.cpp index a1fa7ec096..c2e1e4877d 100644 --- a/core/fxcrt/cfx_widestring.cpp +++ b/core/fxcrt/cfx_widestring.cpp @@ -841,14 +841,10 @@ FX_STRSIZE CFX_WideString::Replace(const CFX_WideStringC& pOld, return nCount; } -void CFX_WideString::SetAt(FX_STRSIZE nIndex, wchar_t ch) { - if (!m_pData) { - return; - } - ASSERT(nIndex >= 0); - ASSERT(nIndex < m_pData->m_nDataLength); +void CFX_WideString::SetAt(FX_STRSIZE index, wchar_t c) { + ASSERT(index >= 0 && index < GetLength()); ReallocBeforeWrite(m_pData->m_nDataLength); - m_pData->m_String[nIndex] = ch; + m_pData->m_String[index] = c; } // static |