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

CSE elimination, fix #6218

Browse Source
This commit is contained in:
Christian Grothoff 2020-04-23 15:26:17 +02:00
parent 7666542ab6
commit 8b99abbe62
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/url.c
View File

@ -84,8 +84,12 @@ static void
buffer_write_urlencode (struct GNUNET_Buffer *buf, buffer_write_urlencode (struct GNUNET_Buffer *buf,
const char *s) const char *s)
{ {
size_t ulen;
ulen = urlencode_len (s);
GNUNET_assert (ulen < ulen + 1);
GNUNET_buffer_ensure_remaining (buf, GNUNET_buffer_ensure_remaining (buf,
urlencode_len (s) + 1); ulen + 1);
for (size_t i = 0; i < strlen (s); i++) for (size_t i = 0; i < strlen (s); i++)
{ {
if (GNUNET_YES == is_reserved (s[i])) if (GNUNET_YES == is_reserved (s[i]))
@ -139,6 +143,8 @@ calculate_argument_length (va_list args)
{ {
char *key; char *key;
char *value; char *value;
size_t vlen;
size_t klen;
key = va_arg (ap, key = va_arg (ap,
char *); char *);
@ -148,10 +154,12 @@ calculate_argument_length (va_list args)
char *); char *);
if (NULL == value) if (NULL == value)
continue; continue;
GNUNET_assert ( (len <= len + urlencode_len (value)) && vlen = urlencode_len (value);
(len <= len + urlencode_len (value) + strlen (key)) && klen = strlen (key);
(len < len + urlencode_len (value) + strlen (key) + 2) ); GNUNET_assert ( (len <= len + vlen) &&
len += urlencode_len (value) + strlen (key) + 2; (len <= len + vlen + klen) &&
(len < len + vlen + klen + 2) );
len += vlen + klen + 2;
} }
va_end (ap); va_end (ap);
return len; return len;