diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-13 14:16:51 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-13 14:16:51 -0700 |
| commit | fdc5e691745cf16fb105f3ad4a9fb5f8f64f56b4 (patch) | |
| tree | 5d484297c58ef03ec594cce66383fdcdfcebb9c4 /core/src/fxcrt/fx_basic_bstring.cpp | |
| parent | 2a47d8d6eef22d117ac3475e84c3a52b5ca41a3c (diff) | |
| download | pdfium-fdc5e691745cf16fb105f3ad4a9fb5f8f64f56b4.tar.xz | |
Fix comparison of CFX_ByteString and CFX_WideString against empty literals.
Also corrects some ASSERT_'s to EXPECT_'s in the test.
BUG=pdfium:160
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1141763002
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_bstring.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 31621490d7..65f4b36b90 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -254,10 +254,10 @@ const CFX_ByteString& CFX_ByteString::operator+=(FX_BSTR string) bool CFX_ByteString::Equal(const char* ptr) const { if (!m_pData) { - return !ptr; + return !ptr || ptr[0] == '\0'; } if (!ptr) { - return false; + return m_pData->m_nDataLength == 0; } return strlen(ptr) == m_pData->m_nDataLength && FXSYS_memcmp32(ptr, m_pData->m_String, m_pData->m_nDataLength) == 0; @@ -272,10 +272,10 @@ bool CFX_ByteString::Equal(const CFX_ByteStringC& str) const } bool CFX_ByteString::Equal(const CFX_ByteString& 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 && |