From ee069c1a7afe29d301f83cbeebf88b075164589e Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Wed, 10 Jan 2024 12:38:34 +1000
Subject: [PATCH] Fix a memory leak in equi_setstate()

---
 components/equihash/src/tromp.rs       |  1 +
 components/equihash/tromp/equi_miner.c | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/components/equihash/src/tromp.rs b/components/equihash/src/tromp.rs
index b3d9a5af94..42f0eb09d8 100644
--- a/components/equihash/src/tromp.rs
+++ b/components/equihash/src/tromp.rs
@@ -94,6 +94,7 @@ unsafe fn worker(eq: *mut CEqui, p: verify::Params, curr_state: &State) -> Vec<V
         // - each solution contains `solution_len` u32 values.
         // - the temporary slices are shared refs to a valid `eq` instance supplied by the caller.
         // - the bytes in the shared ref are copied before they are returned.
+        // - dropping `solutions: &[u32]` does not drop the underlying memory owned by `eq`.
         let solutions = (&mut chunks)
             .map(|solution| solution.to_vec())
             .collect::<Vec<_>>();
diff --git a/components/equihash/tromp/equi_miner.c b/components/equihash/tromp/equi_miner.c
index d0a1e6729d..14f3dd3215 100644
--- a/components/equihash/tromp/equi_miner.c
+++ b/components/equihash/tromp/equi_miner.c
@@ -263,11 +263,19 @@ typedef struct equi equi;
     eq->blake2b_free = blake2b_free;
     eq->blake2b_update = blake2b_update;
     eq->blake2b_finalize = blake2b_finalize;
+
     const int err = pthread_barrier_init(&eq->barry, NULL, eq->nthreads);
     assert(!err);
+
     alloctrees(&eq->hta);
     eq->nslots = (bsizes *)htalloc_alloc(&eq->hta, 2 * NBUCKETS, sizeof(au32));
     eq->sols   =  (proof *)htalloc_alloc(&eq->hta, MAXSOLS, sizeof(proof));
+
+    // C malloc() does not guarantee zero-initialized memory (but calloc() does)
+    eq->blake_ctx = NULL;
+    eq->nsols = 0;
+    equi_clearslots(eq);
+
     return eq;
   }
   void equi_free(equi *eq) {
@@ -276,6 +284,7 @@ typedef struct equi equi;
     }
 
     dealloctrees(&eq->hta);
+
     free(eq->nslots);
     free(eq->sols);
     eq->blake2b_free(eq->blake_ctx);
@@ -287,6 +296,10 @@ typedef struct equi equi;
     free(eq);
   }
   void equi_setstate(equi *eq, const BLAKE2bState *ctx) {
+    if (eq->blake_ctx) {
+      eq->blake2b_free(eq->blake_ctx);
+    }
+
     eq->blake_ctx = eq->blake2b_clone(ctx);
     memset(eq->nslots, 0, NBUCKETS * sizeof(au32)); // only nslots[0] needs zeroing
     eq->nsols = 0;