diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-13 14:27:11 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-13 14:27:11 -0700 |
| commit | e83c77e9a68f2e0ac7632ac40f5b09a0e888093a (patch) | |
| tree | b2c55bd062db704c7a758aee9afb4a788200fe2f /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | cf22eb8ac24d944aac08d6a17c12b8a3a602c6f5 (diff) | |
| download | pdfium-e83c77e9a68f2e0ac7632ac40f5b09a0e888093a.tar.xz | |
Merge to XFA: Fix comparison of CFX_ByteString and CFX_WideString.
Original Review URL: https://codereview.chromium.org/1141763002
BUG=pdfium:160
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1140093003
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index ce3166b196..0511b847e3 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -206,10 +206,10 @@ const CFX_WideString& CFX_WideString::operator+=(const CFX_WideStringC& string) bool CFX_WideString::Equal(const wchar_t* ptr) const { if (!m_pData) { - return !ptr; + return !ptr || ptr[0] == L'\0'; } if (!ptr) { - return false; + return m_pData->m_nDataLength == 0; } return wcslen(ptr) == m_pData->m_nDataLength && wmemcmp(ptr, m_pData->m_String, m_pData->m_nDataLength) == 0; @@ -224,10 +224,10 @@ bool CFX_WideString::Equal(const CFX_WideStringC& str) const } bool CFX_WideString::Equal(const CFX_WideString& other) const { - if (!m_pData) { + if (IsEmpty()) { return other.IsEmpty(); } - if (!other.m_pData) { + if (other.IsEmpty()) { return false; } return other.m_pData->m_nDataLength == m_pData->m_nDataLength && |