summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fxcrt/cfx_bytestring.h4
-rw-r--r--core/fxcrt/cfx_widestring.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_bytestring.h b/core/fxcrt/cfx_bytestring.h
index 3e8b6619c2..0e8e006a3c 100644
--- a/core/fxcrt/cfx_bytestring.h
+++ b/core/fxcrt/cfx_bytestring.h
@@ -107,9 +107,9 @@ class CFX_ByteString {
const CFX_ByteString& operator+=(const CFX_ByteString& str);
const CFX_ByteString& operator+=(const CFX_ByteStringC& bstrc);
- const CharType& operator[](const FX_STRSIZE index) const {
+ CharType operator[](const FX_STRSIZE index) const {
ASSERT(index >= 0 && index < GetLength());
- return m_pData->m_String[index];
+ return m_pData ? m_pData->m_String[index] : 0;
}
void SetAt(FX_STRSIZE index, char c);
diff --git a/core/fxcrt/cfx_widestring.h b/core/fxcrt/cfx_widestring.h
index d57e47c62f..f9e800d0a2 100644
--- a/core/fxcrt/cfx_widestring.h
+++ b/core/fxcrt/cfx_widestring.h
@@ -101,9 +101,9 @@ class CFX_WideString {
bool operator<(const CFX_WideString& str) const;
- const CharType& operator[](const FX_STRSIZE index) const {
+ CharType operator[](const FX_STRSIZE index) const {
ASSERT(index >= 0 && index < GetLength());
- return m_pData->m_String[index];
+ return m_pData ? m_pData->m_String[index] : 0;
}
void SetAt(FX_STRSIZE index, wchar_t c);