external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug of nx_json parse, to 0.9.104

Browse source
This commit is contained in:
winlin 2014-05-18 16:48:24 +08:00
parent d6355efe22
commit 3064e5ec61
4 changed files with 60 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/app/srs_app_json.cpp
View file

@ -306,6 +306,10 @@ SrsJsonArray* SrsJsonAny::array()
#ifdef SRS_JSON_USE_NXJSON
SrsJsonAny* srs_json_parse_tree_nx_json(const nx_json* node)
{
if (!node) {
return NULL;
}
switch (node->type) {
case NX_JSON_NULL:
return SrsJsonAny::null();
@ -338,6 +342,7 @@ SrsJsonAny* srs_json_parse_tree_nx_json(const nx_json* node)
return arr;
}
}
return NULL;
}
@ -352,8 +357,13 @@ SrsJsonAny* SrsJsonAny::loads(char* str)
}
const nx_json* o = nx_json_parse(str, 0);
SrsJsonAny* json = srs_json_parse_tree_nx_json(o);
nx_json_free(o);
if (o) {
nx_json_free(o);
}
return json;
}
#endif
@ -529,7 +539,7 @@ extern "C" {
// redefine NX_JSON_REPORT_ERROR to use custom error reporting
#ifndef NX_JSON_REPORT_ERROR
#define NX_JSON_REPORT_ERROR(msg, p) srs_error("NXJSON PARSE ERROR (%d): " msg " at %s\n", __LINE__, p)
#define NX_JSON_REPORT_ERROR(msg, p) srs_warn("NXJSON PARSE ERROR (%d): " msg " at %s", __LINE__, p)
#endif
#define IS_WHITESPACE(c) ((unsigned char)(c)<=(unsigned char)' ')