From d2d633a1667ea16c9c88eae9d679c91c545a77ee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Feb 2017 20:11:44 +0300 Subject: fix for null avatar hash processing --- libs/libjson/src/internalJSONNode.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/libjson/src/internalJSONNode.h') diff --git a/libs/libjson/src/internalJSONNode.h b/libs/libjson/src/internalJSONNode.h index c77e502543..26e279764e 100644 --- a/libs/libjson/src/internalJSONNode.h +++ b/libs/libjson/src/internalJSONNode.h @@ -285,11 +285,15 @@ inline void internalJSONNode::setname(const json_string & newname){ inline json_string internalJSONNode::as_string(void) const { Fetch(); + if (_type == JSON_NULL) + return json_string(); return _string; } inline CMStringW internalJSONNode::as_mstring(void) const { Fetch(); + if (_type == JSON_NULL) + return CMStringW(); return CMStringW(ptrW(mir_utf8decodeW(_string.c_str()))); } -- cgit v1.2.3