Skip to content

Commit ab31a52

Browse files
committed
Merge bitcoin-core#444: test: Use checked_alloc
5eb030c test: Use checked_alloc (Wladimir J. van der Laan) Tree-SHA512: f0fada02664fca3b4f48795ce29a187331f86f80fc1605150fcfc451e7eb4671f7b5dff09105c9927e28af6d1dafd1edad1671dddd412110f4b5950153df499d
2 parents eda5c1a + 5eb030c commit ab31a52

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/tests.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,9 +1879,9 @@ void test_ge(void) {
18791879
*
18801880
* When the endomorphism code is compiled in, p5 = lambda*p1 and p6 = lambda^2*p1 are added as well.
18811881
*/
1882-
secp256k1_ge *ge = (secp256k1_ge *)malloc(sizeof(secp256k1_ge) * (1 + 4 * runs));
1883-
secp256k1_gej *gej = (secp256k1_gej *)malloc(sizeof(secp256k1_gej) * (1 + 4 * runs));
1884-
secp256k1_fe *zinv = (secp256k1_fe *)malloc(sizeof(secp256k1_fe) * (1 + 4 * runs));
1882+
secp256k1_ge *ge = (secp256k1_ge *)checked_malloc(&ctx->error_callback, sizeof(secp256k1_ge) * (1 + 4 * runs));
1883+
secp256k1_gej *gej = (secp256k1_gej *)checked_malloc(&ctx->error_callback, sizeof(secp256k1_gej) * (1 + 4 * runs));
1884+
secp256k1_fe *zinv = (secp256k1_fe *)checked_malloc(&ctx->error_callback, sizeof(secp256k1_fe) * (1 + 4 * runs));
18851885
secp256k1_fe zf;
18861886
secp256k1_fe zfi2, zfi3;
18871887

@@ -1919,7 +1919,7 @@ void test_ge(void) {
19191919

19201920
/* Compute z inverses. */
19211921
{
1922-
secp256k1_fe *zs = malloc(sizeof(secp256k1_fe) * (1 + 4 * runs));
1922+
secp256k1_fe *zs = checked_malloc(&ctx->error_callback, sizeof(secp256k1_fe) * (1 + 4 * runs));
19231923
for (i = 0; i < 4 * runs + 1; i++) {
19241924
if (i == 0) {
19251925
/* The point at infinity does not have a meaningful z inverse. Any should do. */
@@ -2020,7 +2020,7 @@ void test_ge(void) {
20202020
/* Test adding all points together in random order equals infinity. */
20212021
{
20222022
secp256k1_gej sum = SECP256K1_GEJ_CONST_INFINITY;
2023-
secp256k1_gej *gej_shuffled = (secp256k1_gej *)malloc((4 * runs + 1) * sizeof(secp256k1_gej));
2023+
secp256k1_gej *gej_shuffled = (secp256k1_gej *)checked_malloc(&ctx->error_callback, (4 * runs + 1) * sizeof(secp256k1_gej));
20242024
for (i = 0; i < 4 * runs + 1; i++) {
20252025
gej_shuffled[i] = gej[i];
20262026
}
@@ -2041,9 +2041,9 @@ void test_ge(void) {
20412041

20422042
/* Test batch gej -> ge conversion with and without known z ratios. */
20432043
{
2044-
secp256k1_fe *zr = (secp256k1_fe *)malloc((4 * runs + 1) * sizeof(secp256k1_fe));
2045-
secp256k1_ge *ge_set_table = (secp256k1_ge *)malloc((4 * runs + 1) * sizeof(secp256k1_ge));
2046-
secp256k1_ge *ge_set_all = (secp256k1_ge *)malloc((4 * runs + 1) * sizeof(secp256k1_ge));
2044+
secp256k1_fe *zr = (secp256k1_fe *)checked_malloc(&ctx->error_callback, (4 * runs + 1) * sizeof(secp256k1_fe));
2045+
secp256k1_ge *ge_set_table = (secp256k1_ge *)checked_malloc(&ctx->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
2046+
secp256k1_ge *ge_set_all = (secp256k1_ge *)checked_malloc(&ctx->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
20472047
for (i = 0; i < 4 * runs + 1; i++) {
20482048
/* Compute gej[i + 1].z / gez[i].z (with gej[n].z taken to be 1). */
20492049
if (i < 4 * runs) {

0 commit comments

Comments
 (0)