secp256k1_context_destroy: Allow NULL argument as a no-op

luke-jr · luke-jr · commit 9aac00803826 · 2015-09-19T19:32:48.000Z
diff --git a/include/secp256k1.h b/include/secp256k1.h
@@ -160,7 +160,7 @@ secp256k1_context_t* secp256k1_context_clone(
  */
 void secp256k1_context_destroy(
     secp256k1_context_t* ctx
-) SECP256K1_ARG_NONNULL(1);
+);
 
 /** Set a callback function to be called when an illegal argument is passed to
  *  an API call. It will only trigger for violations that are mentioned
diff --git a/src/secp256k1.c b/src/secp256k1.c
@@ -85,6 +85,9 @@ secp256k1_context_t* secp256k1_context_clone(const secp256k1_context_t* ctx) {
 }
 
 void secp256k1_context_destroy(secp256k1_context_t* ctx) {
+    if (!ctx)
+        return;
+
     secp256k1_ecmult_context_clear(&ctx->ecmult_ctx);
     secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx);
 

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ secp256k1_context_t* secp256k1_context_clone(const secp256k1_context_t* ctx) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`void secp256k1_context_destroy(secp256k1_context_t* ctx) {`
	`88`	`+ if (!ctx)`
	`89`	`+ return;`
	`90`	`+`
`88`	`91`	`secp256k1_ecmult_context_clear(&ctx->ecmult_ctx);`
`89`	`92`	`secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx);`
`90`	`93`