taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix use after free

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-14 16:24:44 +01:00
parent f13f030777
commit 7ae575dccb
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/benchmark/taler-exchange-benchmark.c
View File

@ -830,7 +830,6 @@ main (int argc,
GNUNET_free (cfg_filename); GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
GNUNET_free (cfg_filename);
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, GNUNET_CONFIGURATION_get_value_string (cfg,
"taler", "taler",
@ -841,6 +840,7 @@ main (int argc,
"taler", "taler",
"currency"); "currency");
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
@ -851,6 +851,7 @@ main (int argc,
"CURRENCY", "CURRENCY",
"Value is too long"); "Value is too long");
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
if (howmany_clients > 10240) if (howmany_clients > 10240)
@ -861,6 +862,7 @@ main (int argc,
if (0 == howmany_clients) if (0 == howmany_clients)
{ {
TALER_LOG_ERROR ("-p option value must not be zero\n"); TALER_LOG_ERROR ("-p option value must not be zero\n");
GNUNET_free (cfg_filename);
return BAD_CLI_ARG; return BAD_CLI_ARG;
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -872,6 +874,7 @@ main (int argc,
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"benchmark", "benchmark",
"USER_PAYTO_URI"); "USER_PAYTO_URI");
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
@ -885,6 +888,7 @@ main (int argc,
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Missing specification of bank account in configuration\n"); "Missing specification of bank account in configuration\n");
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
if (GNUNET_OK != if (GNUNET_OK !=
@ -895,6 +899,7 @@ main (int argc,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Configuration fails to provide exchange bank details in section `%s'\n", "Configuration fails to provide exchange bank details in section `%s'\n",
bank_details_section); bank_details_section);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
} }
@ -914,7 +919,8 @@ main (int argc,
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to run `taler-exchange-wire`, is your PATH correct?\n"); "Failed to run `taler-exchange-wire`, is your PATH correct?\n");
return GNUNET_NO; GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE;
} }
GNUNET_OS_process_wait (compute_wire_response); GNUNET_OS_process_wait (compute_wire_response);
GNUNET_OS_process_destroy (compute_wire_response); GNUNET_OS_process_destroy (compute_wire_response);
@ -935,6 +941,7 @@ main (int argc,
"exchange", "exchange",
"base_url"); "base_url");
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
@ -948,6 +955,7 @@ main (int argc,
"benchmark-remote-exchange", "benchmark-remote-exchange",
"host"); "host");
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
@ -961,6 +969,7 @@ main (int argc,
"benchmark-remote-exchange", "benchmark-remote-exchange",
"dir"); "dir");
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
return BAD_CONFIG_FILE; return BAD_CONFIG_FILE;
} }
} }
@ -969,11 +978,13 @@ main (int argc,
NULL, NULL,
cfg_filename); cfg_filename);
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (cfg_filename);
/* If we're the exchange worker, we're done now. No need to print results */ /* If we're the exchange worker, we're done now. No need to print results */
if (MODE_EXCHANGE == mode) if (MODE_EXCHANGE == mode)
{
return (GNUNET_OK == result) ? 0 : result; return (GNUNET_OK == result) ? 0 : result;
}
duration = GNUNET_TIME_absolute_get_duration (start_time); duration = GNUNET_TIME_absolute_get_duration (start_time);
if (GNUNET_OK == result) if (GNUNET_OK == result)
{ {