Added EIP-712 memory allocation cleanup

Author: apaillier-ledger

src_features/signMessageEIP712/context_712.c

@@ -66,6 +66,8 @@ void eip712_context_deinit(void) {
     path_deinit();
     field_hash_deinit();
     ui_712_deinit();
+    sol_typenames_deinit();
+    app_mem_free(eip712_context);
     eip712_context = NULL;
     reset_app_context();
 }

src_features/signMessageEIP712/field_hash.c

@@ -38,7 +38,10 @@ bool field_hash_init(void) {
  * Deinitialize the field hash context
  */
 void field_hash_deinit(void) {
-    fh = NULL;
+    if (fh != NULL) {
+        app_mem_free(fh);
+        fh = NULL;
+    }
 }
 
 /**

src_features/signMessageEIP712/path.c

@@ -156,8 +156,13 @@ cx_sha3_t *get_last_hash_ctx(void) {
     return &((s_hash_ctx *) hash_ctx)->hash;
 }
 
+// to be used as a \ref f_list_node_del
+static void delete_hash_ctx(s_hash_ctx *ctx) {
+    app_mem_free(ctx);
+}
+
 static void remove_last_hash_ctx(void) {
-    flist_pop_back((s_flist_node **) &g_hash_ctxs, NULL);
+    flist_pop_back((s_flist_node **) &g_hash_ctxs, (f_list_node_del) &delete_hash_ctx);
 }
 
 /**
@@ -221,6 +226,7 @@ static bool push_new_hash_depth(bool init) {
     flist_push_back((s_flist_node **) &g_hash_ctxs, (s_flist_node *) hash_ctx);
     return true;
 end:
+    app_mem_free(hash_ctx);
     return false;
 }
 
@@ -788,5 +794,13 @@ bool path_init(void) {
  * De-initialize the path context
  */
 void path_deinit(void) {
-    path_struct = NULL;
+    if (path_struct != NULL) {
+        app_mem_free(path_struct);
+        path_struct = NULL;
+    }
+    if (path_backup != NULL) {
+        app_mem_free(path_backup);
+        path_backup = NULL;
+    }
+    flist_clear((s_flist_node **) &g_hash_ctxs, (f_list_node_del) &delete_hash_ctx);
 }

src_features/signMessageEIP712/sol_typenames.c

@@ -22,7 +22,7 @@ bool sol_typenames_init(void) {
     uint8_t count = TYPES_COUNT - 1;  // because 0 is custom (so not solidity)
 
     if (g_sol_types != NULL) {
-        g_sol_types = NULL;
+        sol_typenames_deinit();
         return false;
     }
     if ((g_sol_types = app_mem_alloc(sizeof(*g_sol_types) * count)) == NULL) {
@@ -63,6 +63,16 @@ bool sol_typenames_init(void) {
     return true;
 }
 
+void sol_typenames_deinit(void) {
+    if (g_sol_types != NULL) {
+        for (int i = 0; i < (TYPES_COUNT - 1); ++i) {
+            app_mem_free(g_sol_types[i].name);
+        }
+        app_mem_free(g_sol_types);
+        g_sol_types = NULL;
+    }
+}
+
 /**
  * Get typename from a given field
  *

src_features/signMessageEIP712/sol_typenames.h

@@ -5,4 +5,5 @@
 #include "typed_data.h"
 
 bool sol_typenames_init(void);
+void sol_typenames_deinit(void);
 const char *get_struct_field_sol_typename(const s_struct_712_field *field_ptr);

src_features/signMessageEIP712/type_hash.c

@@ -139,6 +139,11 @@ static bool compare_struct_deps(const s_struct_dep *a, const s_struct_dep *b) {
     return true;
 }
 
+// to be used as a \ref f_list_node_del
+static void delete_struct_dep(s_struct_dep *sdep) {
+    app_mem_free(sdep);
+}
+
 /**
  * Encode the structure's type and hash it
  *
@@ -175,6 +180,7 @@ bool type_hash(const char *struct_name, const uint8_t struct_name_length, uint8_
         }
     }
 
+    flist_clear((s_flist_node **) &deps, (f_list_node_del) &delete_struct_dep);
     // copy hash into memory
     CX_CHECK(cx_hash_no_throw((cx_hash_t *) &global_sha3,
                               CX_LAST,

src_features/signMessageEIP712/typed_data.c

@@ -20,8 +20,24 @@ bool typed_data_init(void) {
     return true;
 }
 
+// to be used as a \ref f_list_node_del
+static void delete_field(s_struct_712_field *f) {
+    if (f->type_name != NULL) app_mem_free(f->type_name);
+    if (f->array_levels != NULL) app_mem_free(f->array_levels);
+    if (f->key_name != NULL) app_mem_free(f->key_name);
+    app_mem_free(f);
+}
+
+// to be used as a \ref f_list_node_del
+static void delete_struct(s_struct_712 *s) {
+    if (s->name != NULL) app_mem_free(s->name);
+    if (s->fields != NULL)
+        flist_clear((s_flist_node **) &s->fields, (f_list_node_del) &delete_field);
+    app_mem_free(s);
+}
+
 void typed_data_deinit(void) {
-    g_structs = NULL;
+    flist_clear((s_flist_node **) &g_structs, (f_list_node_del) &delete_struct);
 }
 
 /**

src_features/signMessageEIP712/ui_logic.c

@@ -71,6 +71,23 @@ typedef struct {
 
 static t_ui_context *ui_ctx = NULL;
 
+// to be used as a \ref f_list_node_del
+static void delete_filter_crc(s_filter_crc *fcrc) {
+    app_mem_free(fcrc);
+}
+
+// to be used as a \ref f_list_node_del
+static void delete_ui_pair(s_ui_712_pair *pair) {
+    if (pair->key != NULL) app_mem_free(pair->key);
+    if (pair->value != NULL) app_mem_free(pair->value);
+    app_mem_free(pair);
+}
+
+// to be used as a \ref f_list_node_del
+static void delete_amount_join(s_amount_join *join) {
+    app_mem_free(join);
+}
+
 /**
  * Checks on the UI context to determine if the next EIP 712 field should be shown
  *
@@ -485,7 +502,9 @@ static bool ui_712_format_amount_join(void) {
     }
     ui_ctx->field_flags |= UI_712_FIELD_SHOWN;
     ui_712_set_title(amount_join->name, strlen(amount_join->name));
-    explicit_bzero(amount_join, sizeof(*amount_join));
+    flist_remove((s_flist_node **) &ui_ctx->amount.joins,
+                 (s_flist_node *) amount_join,
+                 (f_list_node_del) delete_amount_join);
     return true;
 }
 
@@ -730,7 +749,18 @@ bool ui_712_init(void) {
  * Deinit function that simply unsets the struct pointer to NULL
  */
 void ui_712_deinit(void) {
-    ui_ctx = NULL;
+    if (ui_ctx != NULL) {
+        app_mem_free(ui_ctx);
+        if (ui_ctx->filters_crc != NULL)
+            flist_clear((s_flist_node **) &ui_ctx->filters_crc,
+                        (f_list_node_del) &delete_filter_crc);
+        if (ui_ctx->ui_pairs != NULL)
+            flist_clear((s_flist_node **) &ui_ctx->ui_pairs, (f_list_node_del) &delete_ui_pair);
+        if (ui_ctx->amount.joins != NULL)
+            flist_clear((s_flist_node **) &ui_ctx->amount.joins,
+                        (f_list_node_del) &delete_amount_join);
+        ui_ctx = NULL;
+    }
 }
 
 /**
@@ -1005,7 +1035,7 @@ void ui_712_delete_pairs(size_t keep) {
     size = flist_size((s_flist_node **) &ui_ctx->ui_pairs);
     if (size > 0) {
         while (size > keep) {
-            flist_pop_front((s_flist_node **) &ui_ctx->ui_pairs, NULL);
+            flist_pop_front((s_flist_node **) &ui_ctx->ui_pairs, (f_list_node_del) &delete_ui_pair);
             size -= 1;
         }
     }