secp256k1-sys: patch out checked_malloc

apoelstra · Nov 6, 2023 · 7a0c60e · 7a0c60e
1 parent 942a0e5
commit 7a0c60e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/secp256k1-sys/depend/secp256k1/src/util.h b/secp256k1-sys/depend/secp256k1/src/util.h
@@ -145,11 +145,9 @@ static const rustsecp256k1_v0_9_0_callback default_error_callback = {
 #endif
 
 static SECP256K1_INLINE void *checked_malloc(const rustsecp256k1_v0_9_0_callback* cb, size_t size) {
-    void *ret = malloc(size);
-    if (ret == NULL) {
-        rustsecp256k1_v0_9_0_callback_call(cb, "Out of memory");
-    }
-    return ret;
+    (void) cb;
+    (void) size;
+    return NULL;
 }
 
 #if defined(__BIGGEST_ALIGNMENT__)

diff --git a/secp256k1-sys/depend/util.h.patch b/secp256k1-sys/depend/util.h.patch
@@ -0,0 +1,10 @@
+148,152c148,150
+<     void *ret = malloc(size);
+<     if (ret == NULL) {
+<         secp256k1_callback_call(cb, "Out of memory");
+<     }
+<     return ret;
+---
+>     (void) cb;
+>     (void) size;
+>     return NULL;
diff --git a/secp256k1-sys/vendor-libsecp.sh b/secp256k1-sys/vendor-libsecp.sh
@@ -97,6 +97,7 @@ echo "$SOURCE_REV" >> ./secp256k1-HEAD-revision.txt
 patch "$DIR/include/secp256k1.h" "./secp256k1.h.patch"
 patch "$DIR/src/secp256k1.c" "./secp256k1.c.patch"
 patch "$DIR/src/scratch_impl.h" "./scratch_impl.h.patch"
+patch "$DIR/src/util.h" "./util.h.patch"
 
 # Fix a linking error while cross-compiling to windowns with mingw
 patch "$DIR/contrib/lax_der_parsing.c" "./lax_der_parsing.c.patch"