| Index: core/fxcrt/fx_basic_wstring.cpp
|
| diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
|
| index cd60036acd521319a6e89057074a72cdb11fab97..627573fa7dd70292c8e9c4dcbecb5f556bc5a6b6 100644
|
| --- a/core/fxcrt/fx_basic_wstring.cpp
|
| +++ b/core/fxcrt/fx_basic_wstring.cpp
|
| @@ -372,13 +372,12 @@ CFX_WideString CFX_WideString::FromCodePage(const CFX_ByteString& str,
|
| }
|
|
|
| // static
|
| -CFX_WideString CFX_WideString::FromUTF8(const char* str, FX_STRSIZE len) {
|
| - if (!str || 0 == len) {
|
| +CFX_WideString CFX_WideString::FromUTF8(const CFX_ByteStringC& str) {
|
| + if (str.IsEmpty())
|
| return CFX_WideString();
|
| - }
|
|
|
| CFX_UTF8Decoder decoder;
|
| - for (FX_STRSIZE i = 0; i < len; i++) {
|
| + for (FX_STRSIZE i = 0; i < str.GetLength(); i++) {
|
| decoder.Input(str[i]);
|
| }
|
| return decoder.GetResult();
|
|
|