1 files changed, 47 insertions, 15 deletions

diff --git a/redist/json_helpers.c b/redist/json_helpers.c
index 0267932..af7ddda 100644
--- a/redist/json_helpers.c
+++ b/redist/json_helpers.c
@@ -50,44 +50,46 @@ void json_write_float_array(FILE* f, const char* tag, float* v, uint8_t count) {
 	uint8_t i = 0;
 	char * str1 = NULL;
 	char * str2 = NULL;
-	asprintf(&str1,"\"%s\":[", tag);
+	if( asprintf(&str1,"\"%s\":[", tag) < 0 ) goto giveup;
 
 	for (i=0;i<count;++i) {
 		if ( (i+1) < count) {
-			asprintf(&str2, "%s\"%f\"", str1,v[i]);
+			if( asprintf(&str2, "%s\"%f\"", str1,v[i]) < 0 ) goto giveup;
 		} else {
-			asprintf(&str2, "%s\"%f\",", str1,v[i]);
+			if( asprintf(&str2, "%s\"%f\",", str1,v[i]) < 0 ) goto giveup;
 		}
 		free(str1);
 		str1=str2;
 		str2=NULL;
 	}
-	asprintf(&str2, "%s]", str1);
+	if( asprintf(&str2, "%s]", str1) < 0 ) goto giveup;
 	fputs(str2,f);
-	free(str1);
-	free(str2);
+giveup:
+	if( str1 ) free(str1);
+	if( str2 ) free(str2);
 }
 
 void json_write_double_array(FILE* f, const char* tag, double* v, uint8_t count) {
 	uint8_t i = 0;
 	char * str1 = NULL;
 	char * str2 = NULL;
-	asprintf(&str1,"\"%s\":[", tag);
+	if( asprintf(&str1,"\"%s\":[", tag) < 0 ) goto giveup;
 
 	for (i=0;i<count;++i) {
 		if (i<(count-1)) {
-			asprintf(&str2, "%s\"%f\",", str1,v[i]);
+			if( asprintf(&str2, "%s\"%f\",", str1,v[i]) < 0 ) goto giveup;
 		} else {
-			asprintf(&str2, "%s\"%f\"", str1,v[i]);
+			if( asprintf(&str2, "%s\"%f\"", str1,v[i]) < 0 ) goto giveup;
 		}
 		free(str1);
 		str1=str2;
 		str2=NULL;
 	}
-	asprintf(&str2, "%s]", str1);
+	if( asprintf(&str2, "%s]", str1) < 0 ) goto giveup;
 	fputs(str2,f);
-	free(str1);
-	free(str2);
+giveup:
+	if( str1 ) free(str1);
+	if( str2 ) free(str2);
 }
 
 void json_write_uint32(FILE* f, const char* tag, uint32_t v) {
@@ -117,8 +119,9 @@ char* load_file_to_mem(const char* path) {
 	fseek( f, 0, SEEK_END );
 	int len = ftell( f );
 	fseek( f, 0, SEEK_SET );
-	char * JSON_STRING = malloc( len );
-	fread( JSON_STRING, len, 1, f );
+	char * JSON_STRING = malloc( len + 1);
+	memset(JSON_STRING,0,len+1); 
+	int i = fread( JSON_STRING, len, 1, f ); i = i; //Ignore return value.
 	fclose( f );
 	return JSON_STRING;
 }
@@ -173,7 +176,7 @@ void json_load_file(const char* path) {
 
 	int16_t children = -1;
 
-	for (i=0; i<(int)items; i+=2)
+	for (i=0; i<(unsigned int)items; i+=2)
 	{
 		//increment i on each successful tag + values combination, not individual tokens
 		jsmntok_t* tag_t = tokens+i;
@@ -213,3 +216,32 @@ void json_load_file(const char* path) {
 	free(JSON_STRING);
 }
 
+int parse_float_array(char* str, jsmntok_t* token, FLT** f, uint8_t count) {
+	uint16_t i = 0;
+
+	if (count==0) return 0;
+
+	if (*f!=NULL) free(*f);
+	*f = malloc(sizeof(FLT) * count);
+
+	for(i=0;i<count;++i) {
+		char* end = str + token->end;
+		char* s = str+token->start;
+
+		#ifdef USE_DOUBLE
+		(*f)[i] = strtod(s, &end);
+		#else
+		(*f)[i] = strtof(s, &end);
+		#endif
+
+		if (s == end) {
+			free(*f);
+			*f=NULL;
+			return 0; //not a float
+		}
+		token++;
+	}
+
+
+	return count;
+}
\ No newline at end of file