diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:37:53 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:37:53 -0800 |
| commit | c3e4ae5fe5067723b58a2029a95c6411c92bed15 (patch) | |
| tree | 1544bf8fa786c92a009efc8974886027403c676e /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | 3caa6537663e85ad6874c4420907d2ab885c80ea (diff) | |
| download | pdfium-c3e4ae5fe5067723b58a2029a95c6411c92bed15.tar.xz | |
Merge to master: Take Jun's UTF16LE patches.
(cherry picked from commit 8d89e65897d8b6cf7899e7a82d9d381c3ad327cb)
(cherry picked from commit c70b19aad245fb1ed39bf8c264d991555f4c5a58)
BUG=pdfium:275
TBR=jun_fang@foxitsoftware.com
Review URL: https://codereview.chromium.org/1473753004 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 220ffbd57d..7ea7e8e112 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -287,19 +287,17 @@ CFX_ByteString CFX_WideString::UTF8Encode() const { return FX_UTF8Encode(*this); } CFX_ByteString CFX_WideString::UTF16LE_Encode() const { - if (m_pData == NULL) { - return CFX_ByteString(FX_BSTRC("\0\0")); + CFX_ByteString result; + if (!m_pData) { + return result; } int len = m_pData->m_nDataLength; - CFX_ByteString result; - FX_CHAR* buffer = result.GetBuffer(len * 2 + 2); - for (int i = 0; i < len; i++) { + FX_CHAR* buffer = result.GetBuffer(len * 2); + for (int i = 0; i < len; ++i) { buffer[i * 2] = m_pData->m_String[i] & 0xff; buffer[i * 2 + 1] = m_pData->m_String[i] >> 8; } - buffer[len * 2] = 0; - buffer[len * 2 + 1] = 0; - result.ReleaseBuffer(len * 2 + 2); + result.ReleaseBuffer(len * 2); return result; } void CFX_WideString::ConvertFrom(const CFX_ByteString& str, |