--- libelwix/src/json.c	2019/01/31 22:19:46	1.7.12.1
+++ libelwix/src/json.c	2021/03/21 01:32:04	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.7.12.1 2019/01/31 22:19:46 misho Exp $
+* $Id: json.c,v 1.9 2021/03/21 01:32:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -442,19 +442,25 @@ json_token2val(const char *jstr, jtok_t * __restrict t
 char *
 json_token2str(const char *jstr, jtok_t * __restrict tok)
 {
-	char *str = NULL;
+	char *s, *s2, *wrk, *str = NULL;
 	size_t len;
 
 	if (!jstr || !tok)
 		return NULL;
 
+
 	len = json_toklen(tok);
 	str = e_malloc(len + 1);
 	if (!str)
 		return NULL;
 	else {
-		strncpy(str, json_tokstr(jstr, tok), len);
-		str[len] = 0;
+		memset(str, 0, len + 1);
+
+		wrk = e_strdup(json_tokstr(jstr, tok));
+		wrk[len] = 0;
+		for (s = wrk, s2 = str; *s; s++)
+			*s2++ = (*s != '\\') ? *s : *++s;
+		e_free(wrk);
 	}
 
 	return str;
@@ -561,7 +567,7 @@ json_findbykey(const char *jstr, const char *key, jtyp
 		klen = strlen(key);
 
 	for (i = 1; i < toksnum; i++) {
-		if (toks[i].tok_type == J_STRING && 
+		if (toks[i].tok_type == J_STRING && toks[i].tok_size == 1 && 
 				klen == toks[i].tok_end - toks[i].tok_start && 
 				!strncmp(jstr + toks[i].tok_start, key, klen)) {
 			if (type != J_UNDEF) {