This commit is contained in:
Christian Grothoff 2020-04-21 00:55:38 +02:00
parent 638d97c348
commit 8148c1e8af
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 11 additions and 9 deletions

View File

@ -1039,10 +1039,10 @@ main (int argc,
options, options,
&run, NULL)) &run, NULL))
{ {
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG; return GR_CMD_LINE_OPTIONS_WRONG;
} }
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return global_ret; return global_ret;
} }

View File

@ -560,10 +560,10 @@ main (int argc,
options, options,
&run, NULL)) &run, NULL))
{ {
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG; return GR_CMD_LINE_OPTIONS_WRONG;
} }
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return global_ret; return global_ret;
} }

View File

@ -563,10 +563,10 @@ main (int argc,
options, options,
&run, NULL)) &run, NULL))
{ {
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG; return GR_CMD_LINE_OPTIONS_WRONG;
} }
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return global_ret; return global_ret;
} }

View File

@ -638,10 +638,10 @@ main (int argc,
options, options,
&run, NULL)) &run, NULL))
{ {
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG; return GR_CMD_LINE_OPTIONS_WRONG;
} }
GNUNET_free ((void *) argv); GNUNET_free_nz ((void *) argv);
return global_ret; return global_ret;
} }

View File

@ -399,7 +399,9 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc) struct GNUNET_HashCode *hc)
{ {
const char *payto_uri; const char *payto_uri;
const char *salt; const char *salt; /* Current merchant backend will always make the salt
a `struct GNUNET_HashCode`, but *we* do not insist
on that. */
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("payto_uri", &payto_uri), GNUNET_JSON_spec_string ("payto_uri", &payto_uri),
GNUNET_JSON_spec_string ("salt", &salt), GNUNET_JSON_spec_string ("salt", &salt),