diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-01 16:20:40 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-01 20:42:42 +0000 |
| commit | 0186c1817bd1503051597dbcf0b032d4ff1277ab (patch) | |
| tree | d6fa77d9a14936838de8a54756dc2c27eed85bfe /core/fxcrt/cfx_widestring.cpp | |
| parent | da129ab38c3fb6ed3de85ffb6f8938eb31130a53 (diff) | |
| download | pdfium-0186c1817bd1503051597dbcf0b032d4ff1277ab.tar.xz | |
Remove support for negative params to ReleaseBuffer()
This CL removes the default param value for this method, which was
negative. It also adds in a method to get buffer lengths, so that the
callsites can explictly passing in the length of the buffer if they
were using the default value previously.
BUG=pdfium:828
Change-Id: I0170771ee81970b8b601631015ab3e6e39fea8ea
Reviewed-on: https://pdfium-review.googlesource.com/9790
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_widestring.cpp')
| -rw-r--r-- | core/fxcrt/cfx_widestring.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_widestring.cpp b/core/fxcrt/cfx_widestring.cpp index 8937783863..b83752369b 100644 --- a/core/fxcrt/cfx_widestring.cpp +++ b/core/fxcrt/cfx_widestring.cpp @@ -488,12 +488,10 @@ void CFX_WideString::AllocBeforeWrite(FX_STRSIZE nNewLength) { } void CFX_WideString::ReleaseBuffer(FX_STRSIZE nNewLength) { + ASSERT(nNewLength >= 0); if (!m_pData) return; - if (nNewLength == -1) - nNewLength = FXSYS_wcslen(m_pData->m_String); - nNewLength = std::min(nNewLength, m_pData->m_nAllocLength); if (nNewLength == 0) { clear(); @@ -651,7 +649,7 @@ bool CFX_WideString::TryVSWPrintf(FX_STRSIZE size, memset(m_pData->m_String, 0, (size + 1) * sizeof(wchar_t)); int ret = vswprintf(m_pData->m_String, size + 1, pFormat, argList); bool bSufficientBuffer = ret >= 0 || m_pData->m_String[size - 1] == 0; - ReleaseBuffer(); + ReleaseBuffer(GetStringLength()); return bSufficientBuffer; } |