devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of quotes in digest-md5 challenge.

Browse Source
This commit is contained in:
James Canete
2007-07-25 21:30:40 +00:00
parent cde69ffce4
commit c3b8d03096
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sasl.c
View File

@@ -118,15 +118,24 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
if (key == NULL) break; if (key == NULL) break;
/* advance our start pointer past the key */ /* advance our start pointer past the key */
s = t + 1; s = t + 1;
/* accumulate a value ending in ',' or '\0' */
t = s; t = s;
while ((*t != ',') && (*t != '\0')) t++; /* if we see quotes, grab the string in between */
/* trim quotes if they occur */ if ((*s == '\'') || (*s == '"')) {
if (((*s == '\'') && (*(t-1) == '\'')) || t++;
((*s == '"') && (*(t-1) == '"'))) { while ((*t != *s) && (*t != '\0'))
value = _make_string(ctx, s+1, (t-s-2)); t++;
if (*t == *s) {
value = _make_string(ctx, s+1, (t-s-2));
s = t + 1;
} else {
value = _make_string(ctx, s+1, (t-s-1));
s = t;
}
/* otherwise, accumulate a value ending in ',' or '\0' */
} else { } else {
while ((*t != ',') && (*t != '\0')) t++;
value = _make_string(ctx, s, (t-s)); value = _make_string(ctx, s, (t-s));
s = t;
} }
if (value == NULL) { if (value == NULL) {
xmpp_free(ctx, key); xmpp_free(ctx, key);
@@ -136,8 +145,6 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
hash_add(result, key, value); hash_add(result, key, value);
/* hash table now owns the value, free the key */ /* hash table now owns the value, free the key */
xmpp_free(ctx, key); xmpp_free(ctx, key);
/* advance past the value and any trailing comma */
s = (*t) ? t + 1 : t;
} }
} }
xmpp_free(ctx, text); xmpp_free(ctx, text);