diff options
| author |  Hoà V. DINH <dinh.viet.hoa@gmail.com> | 2014-06-14 22:43:18 -0700 |
|---|---|---|
| committer | Hoà V. DINH <dinh.viet.hoa@gmail.com> | 2014-06-14 22:43:18 -0700 |
| commit | 75d7370ba43601a427df377751ca72c6151f0cee (patch) | |
| tree | 088b0e51bbaa281522aa1ef6f8592331cfc1b522 /src | |
| parent | cdc9ba56a07e5dd33cbe488a803746045cb90455 (diff) | |
| parent | 3781883b6ce99b9b4fb8718c58f573e565b44533 (diff) | |
Merge pull request #738 from CleanShavenApps/mc-master
Potential fix for crashes caused by NULL value returned when parsing text with japanese encoding
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/basetypes/MCData.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/basetypes/MCData.cc b/src/core/basetypes/MCData.cc index 0a03316c..60b8ff8f 100644 --- a/src/core/basetypes/MCData.cc +++ b/src/core/basetypes/MCData.cc @@ -283,6 +283,9 @@ String * Data::stringWithDetectedCharset(String * hintCharset, bool isHTML) if (result == NULL) { result = data->stringWithCharset("iso-2022-jp"); } + if (result == NULL) { + result = MCSTR(""); + } return result; } |