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

url joining: grow strings correctly

Browse Source
This commit is contained in:
Florian Dold 2018-01-31 18:37:40 +01:00
parent f806eebb83
commit 111f8f2381
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/util/util.c
View File

@ -229,20 +229,20 @@ TALER_urlencode (const char *s)
* Grow a string in a buffer with the given size. * Grow a string in a buffer with the given size.
* The buffer is re-allocated if necessary. * The buffer is re-allocated if necessary.
* *
* @param s string buffer * @param s pointer to string buffer
* @param p the string to append * @param p the string to append
* @param n pointer to the allocated size of n * @param n pointer to the allocated size of n
* @returns pointer to the resulting buffer, * @returns pointer to the resulting buffer,
* might differ from @a s (!!) * might differ from @a s (!!)
*/ */
static char * static char *
grow_string (char *s, const char *p, size_t *n) grow_string (char **s, const char *p, size_t *n)
{ {
for (; strlen (s) + strlen (p) >= *n; *n *= 2); for (; strlen (*s) + strlen (p) >= *n; *n *= 2);
s = GNUNET_realloc (s, *n); *s = GNUNET_realloc (*s, *n);
GNUNET_assert (NULL != s); GNUNET_assert (NULL != s);
strncat (s, p, *n); strncat (*s, p, *n);
return s; return *s;
} }
@ -252,16 +252,16 @@ grow_string (char *s, const char *p, size_t *n)
* *
* Ensures that slashes are removed or added when joining paths. * Ensures that slashes are removed or added when joining paths.
* *
* @param s string buffer * @param s pointer to string buffer
* @param p the string to append * @param p the string to append
* @param n pointer to the allocated size of n * @param n pointer to the allocated size of n
* @returns pointer to the resulting buffer, * @returns pointer to the resulting buffer,
* might differ from @a s (!!) * might differ from @a s (!!)
*/ */
static char * static char *
grow_string_path (char *s, const char *p, size_t *n) grow_string_path (char **s, const char *p, size_t *n)
{ {
char a = (0 == strlen (s)) ? '\0' : s[strlen (s) - 1]; char a = (0 == strlen (*s)) ? '\0' : (*s)[strlen (*s) - 1];
char b = (0 == strlen (p)) ? '\0' : p[0]; char b = (0 == strlen (p)) ? '\0' : p[0];
if ( (a == '/') && (b == '/')) if ( (a == '/') && (b == '/'))
@ -270,7 +270,7 @@ grow_string_path (char *s, const char *p, size_t *n)
} }
else if ( (a != '/') && (b != '/')) else if ( (a != '/') && (b != '/'))
{ {
if (NULL == (s = grow_string (s, "/", n))) if (NULL == (*s = grow_string (s, "/", n)))
return NULL; return NULL;
} }
return grow_string (s, p, n); return grow_string (s, p, n);
@ -299,9 +299,9 @@ TALER_url_join (const char *base_url,
GNUNET_assert (NULL != res); GNUNET_assert (NULL != res);
grow_string (res, base_url, &n); grow_string (&res, base_url, &n);
grow_string_path (res, path, &n); grow_string_path (&res, path, &n);
va_start (args, path); va_start (args, path);
@ -314,12 +314,12 @@ TALER_url_join (const char *base_url,
value = va_arg (args, char *); value = va_arg (args, char *);
if (NULL == value) if (NULL == value)
continue; continue;
grow_string (res, (0 == iparam) ? "?" : "&", &n); grow_string (&res, (0 == iparam) ? "?" : "&", &n);
iparam++; iparam++;
grow_string (res, key, &n); grow_string (&res, key, &n);
grow_string (res, "=", &n); grow_string (&res, "=", &n);
enc = TALER_urlencode (value); enc = TALER_urlencode (value);
grow_string (res, enc, &n); grow_string (&res, enc, &n);
GNUNET_free (enc); GNUNET_free (enc);
} }
@ -352,13 +352,13 @@ url_absolute_raw_va (const char *proto,
char *enc; char *enc;
unsigned int iparam = 0; unsigned int iparam = 0;
grow_string (res, proto, &n); grow_string (&res, proto, &n);
grow_string (res, "://", &n); grow_string (&res, "://", &n);
grow_string (res, host, &n); grow_string (&res, host, &n);
grow_string_path (res, prefix, &n); grow_string_path (&res, prefix, &n);
grow_string_path (res, path, &n); grow_string_path (&res, path, &n);
while (1) { while (1) {
char *key; char *key;
@ -369,12 +369,12 @@ url_absolute_raw_va (const char *proto,
value = va_arg (args, char *); value = va_arg (args, char *);
if (NULL == value) if (NULL == value)
continue; continue;
grow_string (res, (0 == iparam) ? "?" : "&", &n); grow_string (&res, (0 == iparam) ? "?" : "&", &n);
iparam++; iparam++;
grow_string (res, key, &n); grow_string (&res, key, &n);
grow_string (res, "=", &n); grow_string (&res, "=", &n);
enc = TALER_urlencode (value); enc = TALER_urlencode (value);
grow_string (res, enc, &n); grow_string (&res, enc, &n);
GNUNET_free (enc); GNUNET_free (enc);
} }