Merge pull request bitcoin#319

67f7da4 Extensive interface and operations tests for secp256k1_ec_pubkey_parse. (Gregory Maxwell) ee2cb40 Add ARG_CHECKs to secp256k1_ec_pubkey_parse/secp256k1_ec_pubkey_serialize (Gregory Maxwell)
jtimon · Oct 14, 2015 · c98df26 · c98df26
2 parents 7450ef1 + 67f7da4
commit c98df26
Show file tree

Hide file tree

Showing 2 changed files with 415 additions and 3 deletions.
diff --git a/src/secp256k1.c b/src/secp256k1.c
@@ -146,8 +146,11 @@ int secp256k1_ec_pubkey_parse(const secp256k1_context* ctx, secp256k1_pubkey* pu
     secp256k1_ge Q;
 
     (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(pubkey != NULL);
+    memset(pubkey, 0, sizeof(*pubkey));
+    ARG_CHECK(input != NULL);
     if (!secp256k1_eckey_pubkey_parse(&Q, input, inputlen)) {
-        memset(pubkey, 0, sizeof(*pubkey));
         return 0;
     }
     secp256k1_pubkey_save(pubkey, &Q);
@@ -159,6 +162,10 @@ int secp256k1_ec_pubkey_serialize(const secp256k1_context* ctx, unsigned char *o
     secp256k1_ge Q;
 
     (void)ctx;
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK(output != NULL);
+    ARG_CHECK(outputlen != NULL);
+    ARG_CHECK(pubkey != NULL);
     return (secp256k1_pubkey_load(ctx, &Q, pubkey) &&
             secp256k1_eckey_pubkey_serialize(&Q, output, outputlen, flags));
 }