REMOVE ME: Attempt to debug MSAN

tcharding · Mar 13, 2024 · 732ee7c · 732ee7c
1 parent fb676dc
commit 732ee7c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/secp256k1-sys/depend/secp256k1/src/secp256k1.c b/secp256k1-sys/depend/secp256k1/src/secp256k1.c
@@ -223,13 +223,31 @@ static void rustsecp256k1_v0_9_2_pubkey_save(rustsecp256k1_v0_9_2_pubkey* pubkey
     }
 }
 
-int rustsecp256k1_v0_9_2_ec_pubkey_parse(const rustsecp256k1_v0_9_2_context* ctx, rustsecp256k1_v0_9_2_pubkey* pubkey, const unsigned char *input, size_t inputlen) {
+int rustsecp256k1_v0_9_2_ec_pubkey_parse(const rustsecp256k1_v0_9_2_context* ctx, rustsecp256k1_v0_9_2_pubkey* _pubkey, const unsigned char *input, size_t inputlen) {
     rustsecp256k1_v0_9_2_ge Q;
 
     VERIFY_CHECK(ctx != NULL);
+
+    rustsecp256k1_v0_9_2_pubkey pk;
+    rustsecp256k1_v0_9_2_pubkey *pubkey = &pk;
+
+    if (pubkey == NULL) {
+        return 1;
+    }
+
     ARG_CHECK(pubkey != NULL);
     memset(pubkey, 0, sizeof(*pubkey));
     ARG_CHECK(input != NULL);
+
+    if (input == NULL) {
+        return 20;
+    }
+
+    if (input[0] == 4) {
+        return 0;
+    }
+
+    /* Array access is causing MSAN error but lines above are ok */
     if (!rustsecp256k1_v0_9_2_eckey_pubkey_parse(&Q, input, inputlen)) {
         return 0;
     }

diff --git a/src/key.rs b/src/key.rs
@@ -470,8 +470,17 @@ impl PublicKey {
         }
 
         unsafe {
+            // Sanity, just ensure we can access the first element here.
+            if data[0] == 0xff {
+                panic!("first element of data is 0xff")
+            }
+            let pointer = data.as_c_ptr();
+            if pointer.is_null() {
+                panic!("pointer is null");
+            }
+
             let mut pk = ffi::PublicKey::new();
-            if ffi::secp256k1_ec_pubkey_parse(
+            if ffi::secp256k1_ec_pubkey_parse( // MSAN bug here.
                 ffi::secp256k1_context_no_precomp,
                 &mut pk,
                 data.as_c_ptr(),