--- libelwix/src/json.c	2017/11/29 00:49:47	1.1.2.9
+++ libelwix/src/json.c	2017/11/29 08:32:46	1.1.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.1.2.9 2017/11/29 00:49:47 misho Exp $
+* $Id: json.c,v 1.1.2.10 2017/11/29 08:32:46 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -570,6 +570,7 @@ json_token2array(const char *jstr, jtok_t * __restrict
 }
 
 
+
 /*
  * json_add_begin_object() - Adds begin of object {
  *
@@ -582,10 +583,14 @@ int
 json_add_begin_object(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
+
 	if (wspace)
 		len = strlcat(jstr, "{ ", jlen);
 	else
@@ -593,6 +598,7 @@ json_add_begin_object(char * __restrict jstr, int jlen
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -611,9 +617,12 @@ int
 json_add_end_object(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
 	if (wspace)
 		len = strlcat(jstr, " }", jlen);
@@ -622,6 +631,7 @@ json_add_end_object(char * __restrict jstr, int jlen, 
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -640,9 +650,12 @@ int
 json_add_begin_array(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
 	if (wspace)
 		len = strlcat(jstr, "[ ", jlen);
@@ -651,6 +664,7 @@ json_add_begin_array(char * __restrict jstr, int jlen,
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -669,9 +683,12 @@ int
 json_add_end_array(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
 	if (wspace)
 		len = strlcat(jstr, " ]", jlen);
@@ -680,6 +697,7 @@ json_add_end_array(char * __restrict jstr, int jlen, i
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -702,7 +720,7 @@ json_add_char(char * __restrict jstr, int jlen, u_char
 	if (!jstr)
 		return -1;
 
-	len = strlen(jstr);
+	len = strlen(jstr) + 1;
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
 		return -1;
@@ -726,9 +744,12 @@ int
 json_add_colon(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
 	if (wspace)
 		len = strlcat(jstr, ": ", jlen);
@@ -737,6 +758,7 @@ json_add_colon(char * __restrict jstr, int jlen, int w
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -755,9 +777,12 @@ int
 json_add_comma(char * __restrict jstr, int jlen, int wspace)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
 	if (wspace)
 		len = strlcat(jstr, ", ", jlen);
@@ -766,6 +791,7 @@ json_add_comma(char * __restrict jstr, int jlen, int w
 
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
 
@@ -785,20 +811,35 @@ int
 json_add_string(char * __restrict jstr, int jlen, int unquot, const char *str)
 {
 	int len;
+	size_t eos;
 
 	if (!jstr || !str)
 		return -1;
+	else
+		eos = strlen(jstr);
 
-	if (!unquot)
+	if (!unquot) {
 		len = strlcat(jstr, "\"", jlen);
+		if (len >= jlen) {
+			elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+			jstr[eos] = 0;
+			return -1;
+		}
+	}
 	len = strlcat(jstr, str, jlen);
-	if (!unquot)
-		len = strlcat(jstr, "\"", jlen);
-
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
+	if (!unquot) {
+		len = strlcat(jstr, "\"", jlen);
+		if (len >= jlen) {
+			elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+			jstr[eos] = 0;
+			return -1;
+		}
+	}
 
 	return len;
 }
@@ -817,21 +858,36 @@ json_add_value(char * __restrict jstr, int jlen, int u
 {
 	int len;
 	char wrk[STRSIZ] = { [0 ... STRSIZ - 1] = 0 };
+	size_t eos;
 
 	if (!jstr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
-	if (!unquot)
+	if (!unquot) {
 		len = strlcat(jstr, "\"", jlen);
+		if (len >= jlen) {
+			elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+			jstr[eos] = 0;
+			return -1;
+		}
+	}
 	snprintf(wrk, sizeof wrk, "%ld", num);
 	len = strlcat(jstr, wrk, jlen);
-	if (!unquot)
-		len = strlcat(jstr, "\"", jlen);
-
 	if (len >= jlen) {
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+		jstr[eos] = 0;
 		return -1;
 	}
+	if (!unquot) {
+		len = strlcat(jstr, "\"", jlen);
+		if (len >= jlen) {
+			elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
+			jstr[eos] = 0;
+			return -1;
+		}
+	}
 
 	return len;
 }
@@ -850,16 +906,25 @@ int
 json_add_pair(char * __restrict jstr, int jlen, int wspace, const char *key, const char *val)
 {
 	int len = -1;
+	size_t eos;
 
 	if (!jstr || !key || !val)
 		return -1;
+	else
+		eos = strlen(jstr);
 
-	if (json_add_string(jstr, jlen, 0, key) == -1)
+	if (json_add_string(jstr, jlen, 0, key) == -1) {
+		jstr[eos] = 0;
 		return -1;
-	if (json_add_colon(jstr, jlen, wspace) == -1)
+	}
+	if (json_add_colon(jstr, jlen, wspace) == -1) {
+		jstr[eos] = 0;
 		return -1;
-	if ((len = json_add_string(jstr, jlen, 0, key)) == -1)
+	}
+	if ((len = json_add_string(jstr, jlen, 0, key)) == -1) {
+		jstr[eos] = 0;
 		return -1;
+	}
 
 	return len;
 }
@@ -879,28 +944,41 @@ json_add_array(char * __restrict jstr, int jlen, int w
 	int len = -1;
 	register int i;
 	ait_val_t *v;
+	size_t eos;
 
 	if (!jstr || !arr)
 		return -1;
+	else
+		eos = strlen(jstr);
 
-	if (json_add_begin_array(jstr, jlen, wspace) == -1)
+	if (json_add_begin_array(jstr, jlen, wspace) == -1) {
+		jstr[eos] = 0;
 		return -1;
+	}
 	for (i = 0; i < array_Size(arr); i++) {
 		v = array(arr, i, ait_val_t*);
 		if (v) {
 			if (AIT_TYPE(v) == string) {
-				if (json_add_string(jstr, jlen, 0, AIT_GET_STR(v)) == -1)
+				if (json_add_string(jstr, jlen, 0, AIT_GET_STR(v)) == -1) {
+					jstr[eos] = 0;
 					return -1;
+				}
 			} else {
-				if (json_add_value(jstr, jlen, 0, AIT_GET_LIKE(v, long)) == -1)
+				if (json_add_value(jstr, jlen, 0, AIT_GET_LIKE(v, long)) == -1) {
+					jstr[eos] = 0;
 					return -1;
+				}
 			}
-			if (i < array_Size(arr) - 1 && json_add_comma(jstr, jlen, wspace) == -1)
+			if (i < array_Size(arr) - 1 && json_add_comma(jstr, jlen, wspace) == -1) {
+				jstr[eos] = 0;
 				return -1;
+			}
 		}
 	}
-	if ((len = json_add_end_array(jstr, jlen, wspace)) == -1)
+	if ((len = json_add_end_array(jstr, jlen, wspace)) == -1) {
+		jstr[eos] = 0;
 		return -1;
+	}
 
 	return len;
 }