3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 23:49:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66 from nullable-type/master

Browse Source 
Made behavior of mg_get_cookie(..) regarding errors the same as of mg_get_var(..)
This commit is contained in:
Sergey Lyubka 2012-12-23 04:40:35 -08:00
commit ab3c070e1c
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mongoose.c
View File

@ -1706,32 +1706,37 @@ int mg_get_cookie(const struct mg_connection *conn, const char *cookie_name,
const char *s, *p, *end;
int name_len, len = -1;
dst[0] = '\0';
if ((s = mg_get_header(conn, "Cookie")) == NULL) {
return -1;
}
if (dst == NULL || dst_size == 0) {
len = -2;
} else if (cookie_name == NULL || (s = mg_get_header(conn, "Cookie")) == NULL) {
len = -1;
dst[0] = '\0';
} else {
name_len = (int) strlen(cookie_name);
end = s + strlen(s);
dst[0] = '\0';
name_len = (int) strlen(cookie_name);
end = s + strlen(s);
for (; (s = strstr(s, cookie_name)) != NULL; s += name_len)
if (s[name_len] == '=') {
s += name_len + 1;
if ((p = strchr(s, ' ')) == NULL)
p = end;
if (p[-1] == ';')
p--;
if (*s == '"' && p[-1] == '"' && p > s + 1) {
s++;
p--;
for (; (s = strstr(s, cookie_name)) != NULL; s += name_len) {
if (s[name_len] == '=') {
s += name_len + 1;
if ((p = strchr(s, ' ')) == NULL)
p = end;
if (p[-1] == ';')
p--;
if (*s == '"' && p[-1] == '"' && p > s + 1) {
s++;
p--;
}
if ((size_t) (p - s) < dst_size) {
len = p - s;
mg_strlcpy(dst, s, (size_t) len + 1);
} else {
len = -2;
}
break;
}
if ((size_t) (p - s) < dst_size) {
len = p - s;
mg_strlcpy(dst, s, (size_t) len + 1);
}
break;
}
}
return len;
}

6
mongoose.h
View File

@ -308,9 +308,9 @@ int mg_get_var(const char *data, size_t data_len,
//
// Return:
// On success, value length.
// On error, -1 (either "Cookie:" header is not present at all, or the
// requested parameter is not found, or destination buffer is too small
// to hold the value).
// On error:
// -1 (either "Cookie:" header is not present at all or the requested parameter is not found).
// -2 (destination buffer is NULL, zero length or too small to hold the value).
int mg_get_cookie(const struct mg_connection *,
const char *cookie_name, char *buf, size_t buf_len);