Merge pull request 'Fix LMDB use-after-free' (#53) from lda/Cytoplasm:fix-deadlock into master

Reviewed-on: Telodendria/Cytoplasm#53

configure

@@ -269,8 +269,10 @@ ${TAB}done
 ${LIB_NAME}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
 
 install: ${LIB_NAME}
-${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
-${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
+${TAB}mkdir -p \$(PREFIX)/${OUT}/lib
+${TAB}mkdir -p \$(PREFIX)/lib
+${TAB}cp ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
+${TAB}cp ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
 $(collect ${INCLUDE}/ '' '' \$\(PREFIX\)/include/${LIB_NAME}/ install_out)
 $(collect ${INCLUDE}/ .h .3 \$\(PREFIX\)/man/man3/${LIB_NAME}- install_man)
 $(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ install_tool)

include/Cytoplasm/Sha.h

@@ -41,6 +41,16 @@
  * due to the lack of a 64-bit integer type, so that hash
  * function has been omitted.
  */
+#include <stddef.h>
+
+/**
+ * This is an enum to be used to identify the type of SHA used.
+ */
+typedef enum HashType
+{
+    HASH_SHA1,
+    HASH_SHA256
+} HashType;
 
 /**
  * This function takes a pointer to a NULL-terminated C string, and
@@ -64,6 +74,20 @@ extern unsigned char * Sha256(char *);
  */
 extern unsigned char * Sha1(char *);
 
+/**
+ * This function behaves just like 
+ * .Fn Sha256 ,
+ * except that it allows for a generic byte array, instead of a string.
+ */
+extern unsigned char * Sha256Raw(unsigned char *, size_t);
+
+/**
+ * This function behaves just like 
+ * .Fn Sha1 ,
+ * except that it allows for a generic byte array, instead of a string.
+ */
+extern unsigned char * Sha1Raw(unsigned char *, size_t);
+
 /**
  * Convert a SHA byte buffer into a hex string. These hex strings
  * are typically what is transmitted, stored, and compared, however
@@ -71,6 +95,6 @@ extern unsigned char * Sha1(char *);
  * bytes directly, which is why the conversion to a hex string is
  * a separate step.
  */
-extern char * ShaToHex(unsigned char *);
+extern char * ShaToHex(unsigned char *, HashType);
 
 #endif                             /* CYTOPLASM_SHA_H */

src/Db/LMDB.c

@@ -293,6 +293,7 @@ LMDBUnlock(Db *d, DbRef *r)
     Stream *stream;
     MDB_val key, val;
     bool ret = true;
+    DbHint hint = r ? r->hint : 0;
 
     if (!d || !r)
     {
@@ -324,7 +325,7 @@ LMDBUnlock(Db *d, DbRef *r)
     {
         free(val.mv_data);
     }
-    if (ret && r->hint == DB_HINT_WRITE)
+    if (ret && hint == DB_HINT_WRITE)
     {
         pthread_mutex_unlock(&d->lock);
     }

src/Memory.c

@@ -40,16 +40,24 @@
 #define MEMORY_HEXDUMP_WIDTH 16
 #endif
 
+#define MEMORY_FILE_SIZE 256
+
 struct MemoryInfo
 {
+    uint64_t magic;
+
     size_t size;
-    const char *file;
+    char file[MEMORY_FILE_SIZE];
     int line;
     void *pointer;
+
+    MemoryInfo *prev;
+    MemoryInfo *next;
 };
 
 #define MEM_BOUND_TYPE uint32_t
 #define MEM_BOUND 0xDEADBEEF
+#define MEM_MAGIC 0xDEADBEEFDEADBEEF
 
 #define MEM_BOUND_LOWER(p) *((MEM_BOUND_TYPE *) p)
 #define MEM_BOUND_UPPER(p, x) *(((MEM_BOUND_TYPE *) (((uint8_t *) p) + x)) + 1)
@@ -59,10 +67,10 @@ static pthread_mutex_t lock;
 static void (*hook) (MemoryAction, MemoryInfo *, void *) = MemoryDefaultHook;
 static void *hookArgs = NULL;
 
-static MemoryInfo **allocations = NULL;
-static size_t allocationsSize = 0;
 static size_t allocationsLen = 0;
 
+static MemoryInfo *allocationTail = NULL;
+
 int
 MemoryRuntimeInit(void)
 {
@@ -91,70 +99,18 @@ MemoryRuntimeDestroy(void)
     return pthread_mutex_destroy(&lock) == 0;
 }
 
-static size_t
-MemoryHash(void *p)
-{
-    return (((size_t) p) >> 2 * 7) % allocationsSize;
-}
-
 static int
 MemoryInsert(MemoryInfo * a)
 {
-    size_t hash;
-
-    if (!allocations)
+    if (allocationTail)
     {
-        allocationsSize = MEMORY_TABLE_CHUNK;
-        allocations = calloc(allocationsSize, sizeof(void *));
-        if (!allocations)
-        {
-            return 0;
-        }
+        allocationTail->next = a;
     }
+    a->next = NULL;
+    a->prev = allocationTail;
+    a->magic = MEM_MAGIC;
 
-    /* If the next insertion would cause the table to be at least 3/4
-     * full, re-allocate and re-hash. */
-    if ((allocationsLen + 1) >= ((allocationsSize * 3) >> 2))
-    {
-        size_t i;
-        size_t tmpAllocationsSize = allocationsSize;
-        MemoryInfo **tmpAllocations;
-
-        allocationsSize += MEMORY_TABLE_CHUNK;
-        tmpAllocations = calloc(allocationsSize, sizeof(void *));
-
-        if (!tmpAllocations)
-        {
-            return 0;
-        }
-
-        for (i = 0; i < tmpAllocationsSize; i++)
-        {
-            if (allocations[i])
-            {
-                hash = MemoryHash(allocations[i]->pointer);
-
-                while (tmpAllocations[hash])
-                {
-                    hash = (hash + 1) % allocationsSize;
-                }
-
-                tmpAllocations[hash] = allocations[i];
-            }
-        }
-
-        free(allocations);
-        allocations = tmpAllocations;
-    }
-
-    hash = MemoryHash(a->pointer);
-
-    while (allocations[hash])
-    {
-        hash = (hash + 1) % allocationsSize;
-    }
-
-    allocations[hash] = a;
+    allocationTail = a;
     allocationsLen++;
 
     return 1;
@@ -163,23 +119,24 @@ MemoryInsert(MemoryInfo * a)
 static void
 MemoryDelete(MemoryInfo * a)
 {
-    size_t hash = MemoryHash(a->pointer);
-    size_t count = 0;
+    MemoryInfo *aPrev = a->prev;
+    MemoryInfo *aNext = a->next;
 
-    while (count <= allocationsSize)
+    if (aPrev)
     {
-        if (allocations[hash] && allocations[hash] == a)
-        {
-            allocations[hash] = NULL;
-            allocationsLen--;
-            return;
-        }
-        else
-        {
-            hash = (hash + 1) % allocationsSize;
-            count++;
-        }
+        aPrev->next = aNext;
     }
+    if (aNext)
+    {
+        aNext->prev = aPrev;
+    }
+
+    if (a == allocationTail)
+    {
+        allocationTail = aPrev;
+    }
+
+    a->magic = ~MEM_MAGIC;
 }
 
 static int
@@ -203,38 +160,31 @@ MemoryAllocate(size_t size, const char *file, int line)
     void *p;
     MemoryInfo *a;
 
-    MemoryIterate(NULL, NULL);
+    //MemoryIterate(NULL, NULL);
 
     pthread_mutex_lock(&lock);
 
-    a = malloc(sizeof(MemoryInfo));
+    a = malloc(sizeof(MemoryInfo) + MEM_SIZE_ACTUAL(size));
     if (!a)
     {
         pthread_mutex_unlock(&lock);
         return NULL;
     }
 
-    p = malloc(MEM_SIZE_ACTUAL(size));
-    if (!p)
-    {
-        free(a);
-        pthread_mutex_unlock(&lock);
-        return NULL;
-    }
+    p = a + 1;
 
     memset(p, 0, MEM_SIZE_ACTUAL(size));
     MEM_BOUND_LOWER(p) = MEM_BOUND;
     MEM_BOUND_UPPER(p, size) = MEM_BOUND;
 
     a->size = MEM_SIZE_ACTUAL(size);
-    a->file = file;
+    strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
     a->line = line;
     a->pointer = p;
 
     if (!MemoryInsert(a))
     {
         free(a);
-        free(p);
         pthread_mutex_unlock(&lock);
         return NULL;
     }
@@ -254,7 +204,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
     MemoryInfo *a;
     void *new = NULL;
 
-    MemoryIterate(NULL, NULL);
+    //MemoryIterate(NULL, NULL);
 
     if (!p)
     {
@@ -265,15 +215,17 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
     if (a)
     {
         pthread_mutex_lock(&lock);
-        new = realloc(a->pointer, MEM_SIZE_ACTUAL(size));
+        MemoryDelete(a);
+        new = realloc(a, sizeof(MemoryInfo) + MEM_SIZE_ACTUAL(size));
         if (new)
         {
-            MemoryDelete(a);
+            a = new;
             a->size = MEM_SIZE_ACTUAL(size);
-            a->file = file;
+            strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
             a->line = line;
+            a->magic = MEM_MAGIC;
 
-            a->pointer = new;
+            a->pointer = a + 1;
             MemoryInsert(a);
 
             MEM_BOUND_LOWER(a->pointer) = MEM_BOUND;
@@ -283,7 +235,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
             {
                 hook(MEMORY_REALLOCATE, a, hookArgs);
             }
-
+            
         }
         pthread_mutex_unlock(&lock);
     }
@@ -293,7 +245,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
         if (a)
         {
             a->size = 0;
-            a->file = file;
+            strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
             a->line = line;
             a->pointer = p;
             hook(MEMORY_BAD_POINTER, a, hookArgs);
@@ -301,7 +253,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
         }
     }
 
-    return ((MEM_BOUND_TYPE *) new) + 1;
+    return ((MEM_BOUND_TYPE *) a->pointer) + 1;
 }
 
 void
@@ -309,7 +261,7 @@ MemoryFree(void *p, const char *file, int line)
 {
     MemoryInfo *a;
 
-    MemoryIterate(NULL, NULL);
+    //MemoryIterate(NULL, NULL);
 
     if (!p)
     {
@@ -322,12 +274,11 @@ MemoryFree(void *p, const char *file, int line)
         pthread_mutex_lock(&lock);
         if (hook)
         {
-            a->file = file;
+            strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
             a->line = line;
             hook(MEMORY_FREE, a, hookArgs);
         }
         MemoryDelete(a);
-        free(a->pointer);
         free(a);
 
         pthread_mutex_unlock(&lock);
@@ -337,7 +288,7 @@ MemoryFree(void *p, const char *file, int line)
         a = malloc(sizeof(MemoryInfo));
         if (a)
         {
-            a->file = file;
+            strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
             a->line = line;
             a->size = 0;
             a->pointer = p;
@@ -350,17 +301,15 @@ MemoryFree(void *p, const char *file, int line)
 size_t
 MemoryAllocated(void)
 {
-    size_t i;
     size_t total = 0;
+    MemoryInfo *cur;
 
     pthread_mutex_lock(&lock);
 
-    for (i = 0; i < allocationsSize; i++)
+    /* TODO */
+    for (cur = allocationTail; cur; cur = cur->prev)
     {
-        if (allocations[i])
-        {
-            total += MemoryInfoGetSize(allocations[i]);
-        }
+        total += MemoryInfoGetSize(cur);
     }
 
     pthread_mutex_unlock(&lock);
@@ -371,55 +320,40 @@ MemoryAllocated(void)
 void
 MemoryFreeAll(void)
 {
-    size_t i;
+    MemoryInfo *cur;
+    MemoryInfo *prev;
 
     pthread_mutex_lock(&lock);
 
-    for (i = 0; i < allocationsSize; i++)
+    /* TODO */
+    for (cur = allocationTail; cur; cur = prev)
     {
-        if (allocations[i])
-        {
-            free(allocations[i]->pointer);
-            free(allocations[i]);
-        }
+        prev = cur->prev;
+        free(cur);
     }
 
-    free(allocations);
-    allocations = NULL;
-    allocationsSize = 0;
     allocationsLen = 0;
 
     pthread_mutex_unlock(&lock);
 }
 
 MemoryInfo *
-MemoryInfoGet(void *p)
+MemoryInfoGet(void *po)
 {
-    size_t hash, count;
+    void *p = po;
 
     pthread_mutex_lock(&lock);
 
-    p = ((MEM_BOUND_TYPE *) p) - 1;
-    hash = MemoryHash(p);
+    p = ((MEM_BOUND_TYPE *) po) - 1;
+    p = ((MemoryInfo *) p) - 1;
 
-    count = 0;
-    while (count <= allocationsSize)
+    if (((MemoryInfo *)p)->magic != MEM_MAGIC)
     {
-        if (!allocations[hash] || allocations[hash]->pointer != p)
-        {
-            hash = (hash + 1) % allocationsSize;
-            count++;
-        }
-        else
-        {
-            MemoryCheck(allocations[hash]);
-            pthread_mutex_unlock(&lock);
-            return allocations[hash];
-        }
+        p = NULL;
     }
 
     pthread_mutex_unlock(&lock);
-    return NULL;
+    return p;
 }
 
 size_t
@@ -467,21 +401,18 @@ MemoryInfoGetPointer(MemoryInfo * a)
 }
 
 void
- MemoryIterate(void (*iterFunc) (MemoryInfo *, void *), void *args)
+MemoryIterate(void (*iterFunc) (MemoryInfo *, void *), void *args)
 {
-    size_t i;
+    MemoryInfo *cur;
 
     pthread_mutex_lock(&lock);
 
-    for (i = 0; i < allocationsSize; i++)
+    for (cur = allocationTail; cur; cur = cur->prev)
     {
-        if (allocations[i])
+        MemoryCheck(cur);
+        if (iterFunc)
         {
-            MemoryCheck(allocations[i]);
-            if (iterFunc)
-            {
-                iterFunc(allocations[i], args);
-            }
+            iterFunc(cur, args);
         }
     }
 

src/Sha.c

@@ -28,21 +28,44 @@
 #include <string.h>
 
 char *
-ShaToHex(unsigned char *bytes)
+ShaToHex(unsigned char *bytes, HashType type)
 {
-    size_t i = 0;
-    char *str = Malloc(((strlen((char *) bytes) * 2) + 1) * sizeof(char));
+    size_t i = 0, size;
+    char *str;
 
+    switch (type)
+    {
+        case HASH_SHA1:
+            size = 20;
+            break;
+        case HASH_SHA256:
+            size = 32;
+            break;
+        default:
+            return NULL;
+    }
+
+    str = Malloc(((size * 2) + 1) * sizeof(char));
     if (!str)
     {
         return NULL;
     }
 
-    while (bytes[i] != '\0')
+    for (i = 0; i < size; i++)
     {
         snprintf(str + (2 * i), 3, "%02x", bytes[i]);
-        i++;
     }
 
     return str;
 }
+unsigned char *
+Sha256(char *str)
+{
+    return Sha256Raw((unsigned char *) str, str ? strlen(str) : 0);
+}
+
+unsigned char *
+Sha1(char *str)
+{
+    return Sha1Raw((unsigned char *) str, str ? strlen(str) : 0);
+}

src/Sha/Sha1.c

@@ -28,6 +28,27 @@
 
 #include <limits.h>
 
+/* TODO: Verify LibreSSL support later */
+#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
+
+#include <openssl/sha.h>
+    
+unsigned char *
+Sha1Raw(unsigned char *str, size_t len)
+{
+    unsigned char *digest;
+    if (!str)
+    {
+        return NULL;
+    }
+
+    digest = Malloc(20 + 1);
+    SHA1(str, len, digest);
+    digest[20] = '\0';
+    return digest;
+}
+#else
+
 #define LOAD32H(x, y) \
 	{ \
 		x = ((uint32_t)((y)[0] & 255) << 24) | \
@@ -240,7 +261,7 @@ Sha1Calculate(Sha1Context * ctx, unsigned char *out)
 }
 
 unsigned char *
-Sha1(char *str)
+Sha1Raw(unsigned char *str, size_t len)
 {
     Sha1Context ctx;
     unsigned char *out;
@@ -257,10 +278,11 @@ Sha1(char *str)
     }
 
     Sha1Init(&ctx);
-    Sha1Update(&ctx, str, strlen(str));
+    Sha1Update(&ctx, str, len);
     Sha1Calculate(&ctx, out);
 
     out[160 / 8] = '\0';
 
     return out;
 }
+#endif

src/Sha/Sha256.c

@@ -21,14 +21,36 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <Sha.h>
 #include <Memory.h>
+#include <Sha.h>
 
 #include <stdio.h>
 #include <string.h>
 
 #include <limits.h>
 
+
+/* TODO: Verify LibreSSL support later */
+#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
+
+#include <openssl/sha.h>
+
+unsigned char *
+Sha256Raw(unsigned char *str, size_t len)
+{
+    unsigned char *digest;
+    if (!str)
+    {
+        return NULL;
+    }
+
+    digest = Malloc(32 + 1);
+    SHA256(str, len, digest);
+    digest[32] = '\0';
+    return digest;
+}
+#else
+
 #define GET_UINT32(x) \
     (((uint32_t)(x)[0] << 24) | \
      ((uint32_t)(x)[1] << 16) | \
@@ -170,7 +192,7 @@ Sha256Process(Sha256Context * context, unsigned char *data, size_t length)
 }
 
 unsigned char *
-Sha256(char *str)
+Sha256Raw(unsigned char *str, size_t len)
 {
     Sha256Context context;
     size_t i;
@@ -206,7 +228,7 @@ Sha256(char *str)
     context.length = 0;
     memset(context.buffer, 0, 64);
 
-    Sha256Process(&context, (unsigned char *) str, strlen(str));
+    Sha256Process(&context, str, len);
 
     memset(fill, 0, 64);
     fill[0] = 0x80;
@@ -230,3 +252,4 @@ Sha256(char *str)
 
     return out;
 }
+#endif

src/Tls/TlsLibreSSL.c

@@ -23,7 +23,7 @@
  */
 #include <Tls.h>
 
-#if TLS_IMPL == TLS_LIBRESSL
+#if defined(TLS_IMPL) && (TLS_IMPL == TLS_LIBRESSL)
 
 #include <Memory.h>
 #include <Log.h>

src/Tls/TlsOpenSSL.c

@@ -23,7 +23,7 @@
  */
 #include <Tls.h>
 
-#if TLS_IMPL == TLS_OPENSSL
+#if defined(TLS_IMPL) && (TLS_IMPL == TLS_OPENSSL)
 
 #include <Memory.h>
 #include <Log.h>

tools/j2s.c

@@ -38,6 +38,7 @@
 
 #define MAX_DEPENDENCIES 32
 
+#define IsDelimited(field, c1, c2) (*field == c1 && field[strlen(field) - 1] == c2)
 static char *
 Trim(char c, char *str)
 {
@@ -75,10 +76,14 @@ TypeToJsonType(char *type)
     }
     else
     {
-        if (*type == '[' && type[strlen(type) - 1] == ']')
+        if (IsDelimited(type, '[', ']'))
         {
             return JSON_ARRAY;
         }
+        else if (IsDelimited(type, '{', '}'))
+        {
+            return JSON_OBJECT;
+        }
         else
         {
             return JSON_OBJECT;
@@ -91,7 +96,7 @@ JsonTypeToStr(JsonType type)
 {
     switch (type)
     {
-            case JSON_OBJECT:
+        case JSON_OBJECT:
             return "JSON_OBJECT";
         case JSON_ARRAY:
             return "JSON_ARRAY";
@@ -325,6 +330,7 @@ Main(Array * args)
             {
                 char *fieldType;
                 bool isArrType = false;
+                bool isObjType = false;
                 JsonValue *requiredVal;
                 JsonValue *ignoreVal;
 
@@ -343,12 +349,18 @@ Main(Array * args)
                     goto finish;
                 }
 
-                if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
+                if (IsDelimited(fieldType, '[', ']'))
                 {
                     fieldType++;
                     fieldType[strlen(fieldType) - 1] = '\0';
                     isArrType = true;
                 }
+                else if (IsDelimited(fieldType, '{', '}'))
+                {
+                    fieldType++;
+                    fieldType[strlen(fieldType) - 1] = '\0';
+                    isObjType = true;
+                }
 
                 if (!StrEquals(fieldType, "object") &&
                     !StrEquals(fieldType, "array") &&
@@ -374,6 +386,10 @@ Main(Array * args)
                 {
                     fieldType[strlen(fieldType)] = ']';
                 }
+                else if (isObjType)
+                {
+                    fieldType[strlen(fieldType)] = '}';
+                }
 
                 requiredVal = HashMapGet(fieldObj, "required");
                 if (requiredVal && JsonValueType(requiredVal) != JSON_BOOLEAN)
@@ -529,11 +545,13 @@ Main(Array * args)
                 {
                     cType = "double";
                 }
-                else if (StrEquals(fieldType, "object"))
+                else if (StrEquals(fieldType, "object") || 
+                        IsDelimited(fieldType, '{', '}'))
                 {
                     cType = "HashMap *";
                 }
-                else if (StrEquals(fieldType, "array") || (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']'))
+                else if (StrEquals(fieldType, "array") || 
+                        IsDelimited(fieldType, '[', ']'))
                 {
                     cType = "Array *";
                 }
@@ -542,7 +560,20 @@ Main(Array * args)
                     cType = fieldType;
                 }
 
-                StreamPrintf(headerFile, "    %s %s;\n", cType, field);
+                if (IsDelimited(fieldType, '{', '}') ||
+                    IsDelimited(fieldType, '[', ']'))
+                {
+                    char end = fieldType[strlen(fieldType) - 1];
+                    fieldType[strlen(fieldType) - 1] = '\0';
+
+                    StreamPrintf(headerFile, "    %s /* of %s */ %s;\n", cType, fieldType + 1, field);
+
+                    fieldType[strlen(fieldType)] = end;
+                }
+                else
+                {
+                    StreamPrintf(headerFile, "    %s %s;\n", cType, field);
+                }
             }
 
             StreamPrintf(headerFile, "} %s;\n\n", type);
@@ -673,7 +704,134 @@ Main(Array * args)
                     StreamPrintf(implFile, "        out->%s = JsonValueAsObject(val);\n", key);
                     StreamPrintf(implFile, "        Free(val); /* Not JsonValueFree() because we want the inner value. */\n");
                 }
-                else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
+                else if (IsDelimited(fieldType, '{', '}'))
+                {
+                    fieldType++;
+                    fieldType[strlen(fieldType) - 1] = '\0';
+                    isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
+                    jsonType = isEnum ? JSON_STRING : TypeToJsonType(fieldType);
+
+                    StreamPrintf(implFile, "        out->%s = HashMapCreate();\n", key);
+                    StreamPrintf(implFile, "        if (!out->%s)\n", key);
+                    StreamPrintf(implFile, "        {\n");
+                    StreamPrintf(implFile, "            *errp = \"Failed to allocate memory for %s.%s.\";\n", type, key);
+                    StreamPrintf(implFile, "            return false;\n");
+                    StreamPrintf(implFile, "        }\n");
+                    StreamPrintf(implFile, "        else\n");
+                    StreamPrintf(implFile, "        {\n");
+                    StreamPrintf(implFile, "            HashMap *obj = JsonValueAsObject(val);\n");
+                    StreamPrintf(implFile, "            char *objKey;\n");
+                    StreamPrintf(implFile, "            JsonValue *v;\n");
+                    StreamPrintf(implFile, "\n");
+                    StreamPrintf(implFile, "            while (HashMapIterate(obj, &objKey, (void **) &v))\n");
+                    StreamPrintf(implFile, "            {\n");
+
+                    if (StrEquals(fieldType, "integer") ||
+                        StrEquals(fieldType, "float") ||
+                        StrEquals(fieldType, "boolean"))
+                    {
+                        char *cType;
+
+                        if (StrEquals(fieldType, "integer"))
+                        {
+                            cType = "int64_t";
+                        }
+                        else if (StrEquals(fieldType, "float"))
+                        {
+                            cType = "double";
+                        }
+                        else if (StrEquals(fieldType, "boolean"))
+                        {
+                            cType = "bool";
+                        }
+                        else
+                        {
+                            /* Should never happen */
+                            cType = NULL;
+                        }
+
+                        *fieldType = toupper(*fieldType);
+
+                        StreamPrintf(implFile, "                %s *ref;\n", cType);
+                        StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"%s.%s{} contains an invalid value.\";\n", type, key);
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                ref = Malloc(sizeof(%s));\n", cType);
+                        StreamPrintf(implFile, "                if (!ref)\n");
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"Unable to allocate memory for object value.\";\n");
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                *ref = JsonValueAs%s(v);\n", fieldType);
+                        StreamPrintf(implFile, "                HashMapSet(out->%s, objKey, ref);\n", key);
+
+                        *fieldType = tolower(*fieldType);
+                    }
+                    else if (StrEquals(fieldType, "string"))
+                    {
+                        StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                HashMapSet(out->%s, objKey, StrDuplicate(JsonValueAsString(v)));\n", key);
+                    }
+                    else if (StrEquals(fieldType, "object"))
+                    {
+                        StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                HashMapSet(out->%s, objKey, JsonDuplicate(JsonValueAsObject(v)));\n", key);
+                    }
+                    else
+                    {
+                        if (isEnum)
+                        {
+                            StreamPrintf(implFile, "                int parseResult;\n");
+                        }
+                        StreamPrintf(implFile, "                %s *parsed;\n", fieldType);
+                        StreamPrintf(implFile, "                if (JsonValueType(v) != %s)\n", JsonTypeToStr(jsonType));
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"%s.%s[] contains an invalid value.\";\n", type, key);
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                parsed = Malloc(sizeof(%s));\n", fieldType);
+                        StreamPrintf(implFile, "                if (!parsed)\n");
+                        StreamPrintf(implFile, "                {\n");
+                        StreamPrintf(implFile, "                    *errp = \"Unable to allocate memory for array value.\";\n");
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        if (isEnum)
+                        {
+                            StreamPrintf(implFile, "                parseResult = %sFromStr(JsonValueAsString(v));\n", fieldType);
+                            StreamPrintf(implFile, "                *parsed = parseResult;\n");
+                            StreamPrintf(implFile, "                if (parseResult == -1)\n");
+                        }
+                        else
+                        {
+                            StreamPrintf(implFile, "                if (!%sFromJson(JsonValueAsObject(v), parsed, errp))\n", fieldType);
+                        }
+                        StreamPrintf(implFile, "                {\n");
+                        if (!isEnum)
+                        {
+                            StreamPrintf(implFile, "                    %sFree(parsed);\n", fieldType);
+                        }
+                        StreamPrintf(implFile, "                    Free(parsed);\n");
+                        StreamPrintf(implFile, "                    return false;\n");
+                        StreamPrintf(implFile, "                }\n");
+                        StreamPrintf(implFile, "                HashMapSet(out->%s, objKey, parsed);\n", key);
+                    }
+
+                    StreamPrintf(implFile, "            }\n");
+                    StreamPrintf(implFile, "        }\n");
+
+                    fieldType[strlen(fieldType)] = '}';
+                }
+                else if (IsDelimited(fieldType, '[', ']'))
                 {
                     fieldType++;
                     fieldType[strlen(fieldType) - 1] = '\0';
@@ -915,7 +1073,73 @@ Main(Array * args)
                 {
                     StreamPrintf(implFile, "    HashMapSet(json, \"%s\", JsonValueObject(JsonDuplicate(val->%s)));\n", Trim('_', key), key);
                 }
-                else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
+                else if (IsDelimited(fieldType, '{', '}'))
+                {
+                    int isPrimitive;
+
+                    fieldType++;
+                    fieldType[strlen(fieldType) - 1] = '\0';
+                    isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
+                    isPrimitive = StrEquals(fieldType, "integer") ||
+                            StrEquals(fieldType, "boolean") ||
+                            StrEquals(fieldType, "float");
+
+
+                    StreamPrintf(implFile, "    if (val->%s)\n", key);
+                    StreamPrintf(implFile, "    {\n");
+                    StreamPrintf(implFile, "        char *objKey;\n");
+                    StreamPrintf(implFile, "        void *objVal;\n");
+                    StreamPrintf(implFile, "        HashMap *jsonObj = HashMapCreate();\n");
+                    StreamPrintf(implFile, "        if (!jsonObj)\n");
+                    StreamPrintf(implFile, "        {\n");
+                    StreamPrintf(implFile, "            JsonFree(json);\n");
+                    StreamPrintf(implFile, "            return NULL;\n");
+                    StreamPrintf(implFile, "        }\n");
+                    StreamPrintf(implFile, "        while (HashMapIterate(val->%s, &objKey, &objVal))\n", key);
+                    StreamPrintf(implFile, "        {\n");
+
+                    if (StrEquals(fieldType, "string"))
+                    {
+                        StreamPrintf(implFile, "            HashMapSet(jsonObj, objKey, JsonValueString(objVal));\n", key);
+                    }
+                    else if (!isPrimitive)
+                    {
+                        StreamPrintf(implFile, "            HashMapSet(jsonObj, objKey, JsonValueObject(%sToJson(objVal)));\n", fieldType, key);
+                    }
+                    else
+                    {
+                        char *cType;
+
+                        if (StrEquals(fieldType, "integer"))
+                        {
+                            cType = "int64_t";
+                        }
+                        else if (StrEquals(fieldType, "float"))
+                        {
+                            cType = "double";
+                        }
+                        else if (StrEquals(fieldType, "boolean"))
+                        {
+                            cType = "bool";
+                        }
+                        else
+                        {
+                            /* Should never happen */
+                            cType = NULL;
+                        }
+
+                        *fieldType = toupper(*fieldType);
+                        StreamPrintf(implFile, "            HashMapSet(jsonObj, objKey, (JsonValue%s(*((%s *) objVal))));\n", fieldType, cType, key);
+                        *fieldType = tolower(*fieldType);
+                    }
+
+                    StreamPrintf(implFile, "        }\n");
+                    StreamPrintf(implFile, "        HashMapSet(json, \"%s\", JsonValueObject(jsonObj));\n", Trim('_', key));
+                    StreamPrintf(implFile, "    }\n");
+
+                    fieldType[strlen(fieldType)] = '}';
+                }
+                else if (IsDelimited(fieldType, '[', ']'))
                 {
                     int isPrimitive;
 
@@ -1036,7 +1260,36 @@ Main(Array * args)
                 {
                     StreamPrintf(implFile, "    Free(val->%s);\n", key);
                 }
-                else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
+                else if (IsDelimited(fieldType, '{', '}'))
+                {
+                    int isPrimitive;
+
+                    fieldType++;
+                    fieldType[strlen(fieldType) - 1] = '\0';
+                    isEnum = StrEquals(JsonValueAsString(JsonGet(types, 2, fieldType, "type")), "enum");
+                    isPrimitive = StrEquals(fieldType, "boolean") ||
+                            StrEquals(fieldType, "float") ||
+                            StrEquals(fieldType, "integer") ||
+                            StrEquals(fieldType, "string");
+
+                    StreamPrintf(implFile, "    if (val->%s)\n", key);
+                    StreamPrintf(implFile, "    {\n");
+                    StreamPrintf(implFile, "        char *objKey;\n");
+                    StreamPrintf(implFile, "        void *objVal;\n");
+                    StreamPrintf(implFile, "        while (HashMapIterate(val->%s, &objKey, &objVal))\n", key);
+                    StreamPrintf(implFile, "        {\n");
+                    StreamPrintf(implFile, "            %sFree(objVal);\n", (!isEnum && !isPrimitive) ? fieldType : "", key);
+                    if (!isEnum && !isPrimitive)
+                    {
+                        StreamPrintf(implFile, "            Free(objVal);\n", key);
+                    }
+                    StreamPrintf(implFile, "        }\n");
+                    StreamPrintf(implFile, "        HashMapFree(val->%s);\n", key);
+                    StreamPrintf(implFile, "    }\n");
+
+                    fieldType[strlen(fieldType)] = '}';
+                }
+                else if (IsDelimited(fieldType, '[', ']'))
                 {
                     int isPrimitive;