--- libelwix/src/json.c	2018/04/19 16:13:48	1.6
+++ libelwix/src/json.c	2024/10/28 09:58:51	1.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.6 2018/04/19 16:13:48 misho Exp $
+* $Id: json.c,v 1.10 2024/10/28 09:58:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2018
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -224,7 +224,7 @@ json_parse_value(json_t * __restrict json, const char 
 			case '}':
 				goto found;
 		}
-		if (jstr[json->h_pos] < 32 || jstr[json->h_pos] > 127) {
+		if (jstr[json->h_pos] < 32 || (u_char) jstr[json->h_pos] > 127) {
 			json->h_pos = pos;
 			elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]);
 			return -1;
@@ -427,7 +427,10 @@ json_token2val(const char *jstr, jtok_t * __restrict t
 		return NULL;
 
 	AIT_SET_STRSIZ(v, json_toklen(tok));
-	strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1);
+	if (AIT_GET_STR(v))
+		strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1);
+	else
+		ait_freeVar(&v);
 
 	return v;
 }
@@ -442,19 +445,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 +570,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) {
@@ -593,7 +602,7 @@ json_findbypos(u_long pos, jtok_t * __restrict toks, i
 	jtok_t *tok = NULL;
 	register int i;
 
-	if (toks)
+	if (!toks)
 		return NULL;
 
 	for (i = 1; i < toksnum; i++)
@@ -636,13 +645,21 @@ json_token2array(const char *jstr, jtok_t * __restrict
 	if (tok->tok_type == J_STRING || tok->tok_type == J_VALUE) {
 		v = ait_getVars(&arr, 0);
 		AIT_SET_STRSIZ(v, json_toklen(tok) + 1);
-		json_tokstrcpy(AIT_GET_STR(v), jstr, tok);
+		if (AIT_GET_STR(v)) {
+			json_tokstrcpy(AIT_GET_STR(v), jstr, tok);
+		} else {
+			ait_freeVar(&v);
+		}
 	} else if (tok->tok_type == J_ARRAY) {
 		for (i = 0, j = 1; i < tok->tok_size; i++) {
 			t = &tok[i + j];
 			v = ait_getVars(&arr, i);
 			AIT_SET_STRSIZ(v, json_toklen(t) + 1);
-			json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+			if (AIT_GET_STR(v)) {
+				json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+			} else {
+				ait_freeVar(&v);
+			}
 
 			/* if there we have array from objects should parse all object tokens */
 			while (i < tok->tok_size - 1 && tok->tok_idx != tok[i + j + 1].tok_parent)
@@ -653,7 +670,11 @@ json_token2array(const char *jstr, jtok_t * __restrict
 			t = &tok[i + 1];
 			v = ait_getVars(&arr, i);
 			AIT_SET_STRSIZ(v, json_toklen(t) + 1);
-			json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+			if (AIT_GET_STR(v)) {
+				json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+			} else {
+				ait_freeVar(&v);
+			}
 		}
 	} else {
 		elwix_SetErr(J_ERR_PARAM, "%s", jerrstr[J_ERR_PARAM]);
@@ -1025,6 +1046,48 @@ json_add_pair(char * __restrict jstr, int jlen, int ws
 }
 
 /*
+ * json_add_pair2() - Adds key/value pair with formated args
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * @key = Key string
+ * @fmt = Format string for values
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int
+json_add_pair2(char * __restrict jstr, int jlen, int wspace, const char *key, const char *fmt, ...)
+{
+	int len = -1;
+	size_t eos;
+	va_list lst;
+	char szStr[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 };
+
+	if (!jstr || !key || !fmt)
+		return -1;
+	else
+		eos = strlen(jstr);
+
+	if (json_add_string(jstr, jlen, 0, key) == -1) {
+		jstr[eos] = 0;
+		return -1;
+	}
+	if (json_add_colon(jstr, jlen, wspace) == -1) {
+		jstr[eos] = 0;
+		return -1;
+	}
+	va_start(lst, fmt);
+	vsnprintf(szStr, sizeof szStr, fmt, lst);
+	va_end(lst);
+	if ((len = json_add_string(jstr, jlen, 0, szStr)) == -1) {
+		jstr[eos] = 0;
+		return -1;
+	}
+
+	return len;
+}
+
+/*
  * json_add_array() - Adds array
  *
  * @jstr = JSON string
@@ -1093,7 +1156,7 @@ json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks
 {
 	register int i, j, k;
 
-	if (!toksnum)
+	if (!toksnum || !toks)
 		return 0;
 
 	if (toks->tok_type == J_VALUE) {