Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow escape inside strings for JSON documents

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-17 17:09:16 +02:00
parent cd5217cdbc
commit fdfd1a910e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -212,8 +212,8 @@ set_package_properties(ZSTD PROPERTIES
TYPE REQUIRED TYPE REQUIRED
) )
# v2.0+ required for json_loads() with three arguments # v2.6+ required for JSON_ALLOW_NUL
find_package(Jansson 2.0) find_package(Jansson 2.6)
set_package_properties(Jansson PROPERTIES set_package_properties(Jansson PROPERTIES
PURPOSE "Required for JSON support" PURPOSE "Required for JSON support"
DESCRIPTION "C library for encoding, decoding and manipulating JSON data" DESCRIPTION "C library for encoding, decoding and manipulating JSON data"

2
src/core/tools/qjsondocument.cpp
View file

@ -51,7 +51,7 @@ QVariantMap QJsonDocumentPrivate::jsonToMap(const QByteArray &jsondata)
} }
json_error_t jerror; json_error_t jerror;
json_t *jroot = json_loads(jsondata.constData(), 0, &jerror); json_t *jroot = json_loads(jsondata.constData(), JSON_ALLOW_NUL, &jerror);
if (!jroot) { if (!jroot) {
error = jerror.text; error = jerror.text;