Changeset 822

Timestamp:

08/15/08 20:20:12 (3 months ago)

Author:

liamstask

Message:

- enhance json encoder to simply return null if the buffer passed in is null

Files:

• firmware/trunk/libraries/json/json.c (modified) (7 diffs)

firmware/trunk/libraries/json/json.c

@@ -143 +143 @@
 char* JsonEncode_ObjectOpen(JsonEncode_State* state, char *buf, int *remaining)
 {
+  if( !buf )
+    return 0;
   int len = 1;
   switch(state->steps[state->depth])
@@ -203 +205 @@
 char* JsonEncode_ObjectClose(JsonEncode_State* state, char *buf, int *remaining)
 {
-  if(*remaining < 1)
+  if(*remaining < 1 || !buf )
     return NULL;
   memcpy(buf, "}", 1);
@@ -222 +224 @@
 char* JsonEncode_ArrayOpen(JsonEncode_State* state, char *buf, int *remaining)
 {
+  if( !buf )
+    return 0;
   int len = 1;
   switch(state->steps[state->depth])
@@ -269 +273 @@
 char* JsonEncode_ArrayClose(JsonEncode_State* state, char *buf, int *remaining)
 {
-  if(*remaining < 1)
+  if(*remaining < 1 || !buf )
     return NULL;
   memcpy(buf, "]", 1);
@@ -291 +295 @@
 char* JsonEncode_String(JsonEncode_State* state, char *buf, const char *string, int *remaining)
 {
+  if( !buf )
+    return 0;
   int string_len = strlen(string) + 2 /* quotes */;
 
@@ -345 +351 @@
 char* JsonEncode_Int(JsonEncode_State* state, char *buf, int value, int *remaining)
 {
+  if( !buf )
+    return 0;
   int int_as_str_len = 11; // largest 32-bit int is 10 digits long, and also leave room for a +/-
   int int_len = 0;
@@ -400 +408 @@
 char* JsonEncode_Bool(JsonEncode_State* state, char *buf, bool value, int *remaining)
 {
+  if( !buf )
+    return 0;
   const char* boolval = (value) ? "true" : "false";
   int bool_len = strlen(boolval);