lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

change mg_get_cookie to ignore substrings

Browse Source
This commit is contained in:
Peter Foerster
2016-08-09 13:51:09 +02:00
parent d98353d540
commit b67b8c7c03
1 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/civetweb.c
View File

@@ -4853,56 +4853,46 @@ mg_get_cookie(const char *cookie_header,
size_t dst_size) size_t dst_size)
{ {
const char *s, *p, *end; const char *s, *p, *end;
size_t name_len, len; int name_len, len = -1;
if (dst == NULL || dst_size == 0) { if (dst == NULL || dst_size == 0) {
return -2; return -2;
} }
*dst = '\0';
dst[0] = '\0';
if (var_name == NULL || (s = cookie_header) == NULL) { if (var_name == NULL || (s = cookie_header) == NULL) {
return -1; return -1;
} }
#if 1
/* that is only for travis error: mg_strcasestr defined but not used */ name_len = (int)strlen(var_name);
IGNORE_UNUSED_RESULT( mg_strcasestr( "", "")); end = s + strlen(s);
#endif for (; (s = mg_strcasestr( s, var_name)) != NULL; s += name_len) {
name_len = strlen(var_name); if (s[name_len] == '=') {
end = s + strlen(s); /* HCP24: now check is it a substring or a full cookie name */
/* ignore starting spaces */ if ((s == cookie_header) || (s[-1] == ' ')) {
while (*s == ' ') s++; s += name_len + 1;
/* first search '=' */ if ((p = strchr(s, ' ')) == NULL) {
while ((p = strchr(s, '=')) != NULL) {
len = (size_t)(p - s);
if (len == name_len) {
if (mg_strncasecmp(s, var_name, name_len) == 0) {
/* var_name found */
s = p + 1;
/* s points to value */
/* cookie must be : name1=value1; name2=value2*/
/* TODO: very simple scanning if values with '; ' exists it does not work */
/* but in the moment much better then search only ' '*/
p = strstr(s, "; ");
if (p == NULL) {
p = end; p = end;
} }
if (p[-1] == ';') {
p--;
}
if (*s == '"' && p[-1] == '"' && p > s + 1) { if (*s == '"' && p[-1] == '"' && p > s + 1) {
s++; s++;
p--; p--;
} }
len = (size_t)(p - s); if ((size_t)(p - s) < dst_size) {
if (len < dst_size) { len = (int)(p - s);
mg_strlcpy(dst, s, len + 1); mg_strlcpy(dst, s, (size_t)len + 1);
return (int)len;
} }
return -3; else {
len = -3;
}
break;
} }
} }
/* not found goto next */
if ((s = strstr(p, "; ")) == NULL)
break; /* no more - finish */
s += 2; /* move to name ( after "; ") */
} }
return -1; return len;
} }