Crash seen with startup mode as running with the XML_DB format being …

…set to JSON. [clixon : 4.7.0] #138
clicon · Oct 17, 2020 · 46bee9e · 46bee9e
1 parent 4d35ace
commit 46bee9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,6 +70,7 @@ Users may have to change how they access the system
 
 ### Corrected Bugs
 
+* Fixed [Crash seen with startup mode as running with the XML_DB format being set to JSON. [clixon : 4.7.0] #138](https://github.com/clicon/clixon/issues/138)
 * Fixed: Performance enhancement of unique list check (of duplicate keys)
 * Fixed: Validate/commit error with false positive yang choice changes detected in validation found in ietf-ipfix-psamp.yang.
 * Fixed: Accepted added subtrees containing lists with duplicate keys.

diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
@@ -1230,7 +1230,11 @@ _json_parse(char      *str,
 	/* RFC 7951 Section 4: A namespace-qualified member name MUST be used for all 
 	 * members of a top-level JSON object 
 	 */
-	if (yspec && xml_prefix(x) == NULL){
+	if (yspec && xml_prefix(x) == NULL
+#ifdef XMLDB_CONFIG_HACK
+	    && strcmp(xml_name(x), "config") != 0 
+#endif
+	    ){
 	    if ((cberr = cbuf_new()) == NULL){
 		clicon_err(OE_UNIX, errno, "cbuf_new");
 		goto done;