Merge pull request eclipse-wakaama#390 from eclipse/fix_json

Fix JSON serialization issues eclipse-wakaama#370 and eclipse-wakaama#371.
XiaoboYang · Sep 7, 2018 · 2ef18c5 · 2ef18c5
2 parents 3e038d3 + 311d754
commit 2ef18c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/er-coap-13/er-coap-13.c b/core/er-coap-13/er-coap-13.c
@@ -46,7 +46,7 @@
 
 #include "er-coap-13.h"
 
-#include "liblwm2m.h" /* for lwm2m_malloc() and lwm2m_free() */
+#include "../liblwm2m.h" /* for lwm2m_malloc() and lwm2m_free() */
 
 #define DEBUG 0
 #if DEBUG

diff --git a/core/json.c b/core/json.c
@@ -1120,7 +1120,7 @@ static int prv_serializeValue(lwm2m_data_t * tlvP,
         head = JSON_ITEM_STRING_BEGIN_SIZE;
 
         res = utils_base64Encode(tlvP->value.asBuffer.buffer, tlvP->value.asBuffer.length, buffer+head, bufferLen - head);
-        if (res == 0) return -1;
+        if (tlvP->value.asBuffer.length != 0 && res == 0) return -1;
         head += res;
 
         if (bufferLen - head < JSON_ITEM_STRING_END_SIZE) return -1;
@@ -1414,7 +1414,7 @@ int json_serialize(lwm2m_uri_t * uriP,
         int res;
 
         res = prv_serializeData(targetP + index, NULL, 0, bufferJSON + head, PRV_JSON_BUFFER_SIZE - head);
-        if (res < 0) return 0;
+        if (res < 0) return res;
         head += res;
     }
 
@@ -1426,7 +1426,7 @@ int json_serialize(lwm2m_uri_t * uriP,
     head = head + JSON_FOOTER_SIZE;
 
     *bufferP = (uint8_t *)lwm2m_malloc(head);
-    if (*bufferP == NULL) return 0;
+    if (*bufferP == NULL) return -1;
     memcpy(*bufferP, bufferJSON, head);
 
     return head;

diff --git a/examples/shared/connection.c b/examples/shared/connection.c
@@ -185,7 +185,7 @@ int connection_send(connection_t *connP,
         port = saddr->sin6_port;
     }
 
-    fprintf(stderr, "Sending %d bytes to [%s]:%hu\r\n", length, s, ntohs(port));
+    fprintf(stderr, "Sending %lu bytes to [%s]:%hu\r\n", length, s, ntohs(port));
 
     output_buffer(stderr, buffer, length, 0);
 #endif