Merge to XFA: Fix comparison of CFX_ByteString and CFX_WideString.

core/src/fxcrt/fx_basic_bstring.cpp

Index: core/src/fxcrt/fx_basic_bstring.cpp
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp
index 31621490d70ecf6b94253bcad32c3eef2415ebdc..65f4b36b90227ba83a3e9649db44fef4d223b80b 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 &&