Implement an untested memory allocation function and pray for forgive…

…ness.
cr1901 · Feb 16, 2019 · 23b5a59 · 23b5a59
1 parent 0ccc5b2
commit 23b5a59
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/cisparse.h b/cisparse.h
@@ -203,7 +203,7 @@ typedef struct
     memory used by each tuple's pointers won't go out of scope. */
     /* Return true for success, false for "unable to complete task". */
     bool (* foreach)(cis_tuple_t curr, void * user);
-    bool (* alloc)(void ** mem_ptr, size_t size, void * user);
+    bool (* alloc)(void ** mem_ptr, cis_alloc_req_t type, size_t size, void * user);
     bool debug; /* Print parser debugging info if true. */
     void * user;
 

diff --git a/dumpcis.c b/dumpcis.c
@@ -58,7 +58,7 @@ typedef struct
 void cis_perror(dumpcis_error_t err);
 print_error_t cis_print();
 bool foreach_tuple(cis_tuple_t curr, void * user);
-bool alloc_tuple(void ** mem_ptr, size_t size, void * user);
+bool alloc_tuple(void ** mem_ptr, cis_alloc_req_t type, size_t size, void * user);
 
 int main()
 {
@@ -242,7 +242,40 @@ bool foreach_tuple(cis_tuple_t curr, void * user)
     return false;
 }
 
-bool alloc_tuple(void ** mem_ptr, size_t size, void * user)
+bool alloc_tuple(void ** mem_ptr, cis_alloc_req_t type, size_t size, void * user)
 {
+    dumpcis_user_t * ptrs = user;
+    bool alloc_rc = false;
+
+    /* I hope I'm forgiven one day for this... */
+    #define BOUNDED_ALLOC_AND_RETURN(_array, _offset, _type) do { \
+        if((_offset + size) < (sizeof(_array)/sizeof(_type)))     \
+        {                                                         \
+            *mem_ptr = &_array[_offset];                          \
+            _offset += size;                                      \
+            return true;                                          \
+        }                                                         \
+        else                                                      \
+        {                                                         \
+            return false;                                         \
+        }                                                         \
+    } while(false)
+
+
+    switch(type)
+    {
+        case ALLOC_CHAR_STR:
+            BOUNDED_ALLOC_AND_RETURN(string, ptrs->string, char);
+        case ALLOC_CHAR_PTR:
+            BOUNDED_ALLOC_AND_RETURN(str_ptr, ptrs->str_ptr, char *);
+        case ALLOC_MFC_ADDR:
+            BOUNDED_ALLOC_AND_RETURN(mfc_addr, ptrs->mfc_addr, cis_mfc_addr_t);
+        case ALLOC_DEV_INFO:
+            BOUNDED_ALLOC_AND_RETURN(device_info, ptrs->device_info, cis_device_info_t);
+        default:
+            return false;
+    }
+
+    /* Unreachable. */
     return false;
 }