summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-12-19 20:43:41 +0100
committerChristian Grothoff <christian@grothoff.org>2015-12-19 20:43:41 +0100
commit2d6303c698a277c831938c31a029661758ac397c (patch)
tree5e4f85400259921559cbce086ea5d6ddfa01544d
parentbd44a3ee4cdf05ead052318e95a3146c1b541fbc (diff)
downloadexchange-2d6303c698a277c831938c31a029661758ac397c.tar.gz
exchange-2d6303c698a277c831938c31a029661758ac397c.tar.bz2
exchange-2d6303c698a277c831938c31a029661758ac397c.zip
avoid generating URLs with // in them
-rw-r--r--src/mint-lib/mint_api_handle.c4
-rw-r--r--src/util/wireformats.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mint-lib/mint_api_handle.c b/src/mint-lib/mint_api_handle.c
index ef3da60ec..0ee24123f 100644
--- a/src/mint-lib/mint_api_handle.c
+++ b/src/mint-lib/mint_api_handle.c
@@ -695,6 +695,10 @@ MAH_path_to_url (struct TALER_MINT_Handle *h,
{
char *url;
+ if ( ('/' == path[0]) &&
+ (0 < strlen (h->url)) &&
+ ('/' == h->url[strlen (h->url) - 1]) )
+ path++; /* avoid generating URL with "//" from concat */
GNUNET_asprintf (&url,
"%s%s",
h->url,
diff --git a/src/util/wireformats.c b/src/util/wireformats.c
index 4e9281899..dab7fb926 100644
--- a/src/util/wireformats.c
+++ b/src/util/wireformats.c
@@ -334,7 +334,7 @@ validate_sepa (const json_t *wire)
"s:s," /* name: beneficiary name */
"s:s," /* BIC: beneficiary bank's BIC */
"s:i," /* r: random 64-bit integer nounce */
- "s?s" /* address: address of the beneficiary */
+ "s:s" /* address: address of the beneficiary */
"}",
"type", &type,
"IBAN", &iban,