Merge tag 'v0.4.2' into dev

TinyCBOR release 0.4.2

This is a bugfix release. Important bugs fixed in this release:
 - Fixed builds against a static cJSON
 - Fixed MSVC builds
 - Fixed builds on freestanding C implementation (no FILE* API)
 - Fixed the return value of cbor_encoder_close_container when a previous OOM
   condition had been detected
 - Fixed the build in strict C89 mode (no C99 extensions)

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

src/cborencoder.c

@@ -531,6 +531,8 @@ CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *
     encoder->end = containerEncoder->end;
     if (containerEncoder->flags & CborIteratorFlag_UnknownLength)
         return append_byte_to_buffer(encoder, BreakByte);
+    if (encoder->end)
+        return CborErrorOutOfMemory;    /* keep the state */
     return CborNoError;
 }
 

tools/json2cbor/json2cbor.c

@@ -149,12 +149,13 @@ uint8_t *decode_base64url(const char *string, size_t *len)
 
 uint8_t *decode_base16(const char *string, size_t *len)
 {
+    size_t i;
     *len = strlen(string) / 2;
     uint8_t *buffer = malloc(*len);
     if (buffer == NULL)
         return NULL;
 
-    for (size_t i = 0; i < *len; ++i) {
+    for (i = 0; i < *len; ++i) {
         char c = string[i * 2];
         if (c >= '0' && c <= '9') {
             buffer[i] = (c - '0') << 4;