Merge bitcoin-core#1114: _scratch_destroy: move VERIFY_CHECK after invalid scrach space check

jonasnick · jonasnick · commit accadc94df5a · 2022-06-29T20:32:00.000Z
1827c9b scratch_destroy: move VERIFY_CHECK after invalid scrach space check (siv2r) Pull request description: ACKs for top commit: sipa: utACK 1827c9b jonasnick: ACK 1827c9b Tree-SHA512: 5c4f97ca16f46380b30d1d077a54e25eab21efb10e0ce3ca27e7f73a2318d130f0f0773e26b2fdfc8f9d98c1334880f9d80a51b0941be3ba0af2b656b7c0ea7e
diff --git a/src/scratch_impl.h b/src/scratch_impl.h
@@ -25,11 +25,11 @@ static secp256k1_scratch* secp256k1_scratch_create(const secp256k1_callback* err
 
 static void secp256k1_scratch_destroy(const secp256k1_callback* error_callback, secp256k1_scratch* scratch) {
     if (scratch != NULL) {
-        VERIFY_CHECK(scratch->alloc_size == 0); /* all checkpoints should be applied */
         if (secp256k1_memcmp_var(scratch->magic, "scratch", 8) != 0) {
             secp256k1_callback_call(error_callback, "invalid scratch space");
             return;
         }
+        VERIFY_CHECK(scratch->alloc_size == 0); /* all checkpoints should be applied */
         memset(scratch->magic, 0, sizeof(scratch->magic));
         free(scratch);
     }

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ static secp256k1_scratch* secp256k1_scratch_create(const secp256k1_callback* err`
`25`	`25`
`26`	`26`	`static void secp256k1_scratch_destroy(const secp256k1_callback* error_callback, secp256k1_scratch* scratch) {`
`27`	`27`	`if (scratch != NULL) {`
`28`		`- VERIFY_CHECK(scratch->alloc_size == 0); /* all checkpoints should be applied */`
`29`	`28`	`if (secp256k1_memcmp_var(scratch->magic, "scratch", 8) != 0) {`
`30`	`29`	`secp256k1_callback_call(error_callback, "invalid scratch space");`
`31`	`30`	`return;`
`32`	`31`	`}`
	`32`	`+ VERIFY_CHECK(scratch->alloc_size == 0); /* all checkpoints should be applied */`
`33`	`33`	`memset(scratch->magic, 0, sizeof(scratch->magic));`
`34`	`34`	`free(scratch);`
`35`	`35`	`}`