summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-04-21 00:55:38 +0200
committerChristian Grothoff <christian@grothoff.org>2020-04-21 00:55:38 +0200
commit8148c1e8af096bf41bf2eef0889df3a972c7c6db (patch)
tree649affe1a48f0509d24a66044ab774758598a1c3
parent638d97c348343819343dc0b5b831b61c3a76b52c (diff)
downloadexchange-8148c1e8af096bf41bf2eef0889df3a972c7c6db.tar.gz
exchange-8148c1e8af096bf41bf2eef0889df3a972c7c6db.tar.bz2
exchange-8148c1e8af096bf41bf2eef0889df3a972c7c6db.zip
fix #6186
-rw-r--r--src/exchange/taler-exchange-aggregator.c4
-rw-r--r--src/exchange/taler-exchange-closer.c4
-rw-r--r--src/exchange/taler-exchange-transfer.c4
-rw-r--r--src/exchange/taler-exchange-wirewatch.c4
-rw-r--r--src/json/json_wire.c4
5 files changed, 11 insertions, 9 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index 0b98a342..21a29e50 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -1039,10 +1039,10 @@ main (int argc,
options,
&run, NULL))
{
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG;
}
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return global_ret;
}
diff --git a/src/exchange/taler-exchange-closer.c b/src/exchange/taler-exchange-closer.c
index b4faffb4..54248943 100644
--- a/src/exchange/taler-exchange-closer.c
+++ b/src/exchange/taler-exchange-closer.c
@@ -560,10 +560,10 @@ main (int argc,
options,
&run, NULL))
{
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG;
}
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return global_ret;
}
diff --git a/src/exchange/taler-exchange-transfer.c b/src/exchange/taler-exchange-transfer.c
index 1793dc98..d21f9ccf 100644
--- a/src/exchange/taler-exchange-transfer.c
+++ b/src/exchange/taler-exchange-transfer.c
@@ -563,10 +563,10 @@ main (int argc,
options,
&run, NULL))
{
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG;
}
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return global_ret;
}
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index fba00297..47f2bdb6 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -638,10 +638,10 @@ main (int argc,
options,
&run, NULL))
{
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return GR_CMD_LINE_OPTIONS_WRONG;
}
- GNUNET_free ((void *) argv);
+ GNUNET_free_nz ((void *) argv);
return global_ret;
}
diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index f0580819..837263c1 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -399,7 +399,9 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc)
{
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[] = {
GNUNET_JSON_spec_string ("payto_uri", &payto_uri),
GNUNET_JSON_spec_string ("salt", &salt),