Skip to content

Commit c09215f

Browse files
committed
bench: fail early if user inputs invalid value for SECP256K1_BENCH_ITERS
In this change the get_iters function was updated to print an error message and then return 0. In the functions that use get_iters they print the help text and then EXIT_FAILURE
1 parent 4721e07 commit c09215f

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

src/bench.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@ int main(int argc, char** argv) {
177177
bench_data data;
178178

179179
int d = argc == 1;
180-
int default_iters = 20000;
181-
int iters = get_iters(default_iters);
182180

183181
/* Check for invalid user arguments */
184182
char* valid_args[] = {"ecdsa", "verify", "ecdsa_verify", "sign", "ecdsa_sign", "ecdh", "recover",
@@ -188,6 +186,13 @@ int main(int argc, char** argv) {
188186
size_t valid_args_size = sizeof(valid_args)/sizeof(valid_args[0]);
189187
int invalid_args = have_invalid_args(argc, argv, valid_args, valid_args_size);
190188

189+
int default_iters = 20000;
190+
int iters = get_iters(default_iters);
191+
if (iters == 0) {
192+
help(default_iters);
193+
return EXIT_FAILURE;
194+
}
195+
191196
if (argc > 1) {
192197
if (have_flag(argc, argv, "-h")
193198
|| have_flag(argc, argv, "--help")

src/bench.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,13 @@ static int have_invalid_args(int argc, char** argv, char** valid_args, size_t n)
150150
static int get_iters(int default_iters) {
151151
char* env = getenv("SECP256K1_BENCH_ITERS");
152152
if (env) {
153-
return strtol(env, NULL, 0);
153+
char* endptr;
154+
long int iters = strtol(env, &endptr, 0);
155+
if (*endptr != '\0' || iters <= 0) {
156+
printf("Error: Value of SECP256K1_BENCH_ITERS is not a positive integer: %s\n\n", env);
157+
return 0;
158+
}
159+
return iters;
154160
} else {
155161
return default_iters;
156162
}

src/bench_ecmult.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ int main(int argc, char **argv) {
313313

314314
int default_iters = 10000;
315315
int iters = get_iters(default_iters);
316+
if (iters == 0) {
317+
help(argv, default_iters);
318+
return EXIT_FAILURE;
319+
}
316320

317321
data.ecmult_multi = secp256k1_ecmult_multi_var;
318322

src/bench_internal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,13 @@ static void bench_context(void* arg, int iters) {
385385

386386
int main(int argc, char **argv) {
387387
bench_inv data;
388+
int d = argc == 1; /* default */
388389
int default_iters = 20000;
389390
int iters = get_iters(default_iters);
390-
int d = argc == 1; /* default */
391+
if (iters == 0) {
392+
help(default_iters);
393+
return EXIT_FAILURE;
394+
}
391395

392396
if (argc > 1) {
393397
if (have_flag(argc, argv, "-h")

0 commit comments

Comments
 (0)