Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] wininet: Handle empty expires for cookie setting.

Browse source 
Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c06e00ee6a15fd77faf66b28edac5e84ad30b550 by Jactry Zeng <jzeng@codeweavers.com>
This commit is contained in:
winesync 2020-12-08 18:01:29 +01:00 committed by Jérôme Gardou
parent 9982fa3c75
commit 94e13ca59b
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/wininet/cookie.c
View file

@ -981,7 +981,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D
substr_skip(&data, len);
if(end_ptr - data.str < ARRAY_SIZE(buf)-1) {
if(end_ptr > data.str && (end_ptr - data.str < ARRAY_SIZE(buf) - 1)) {
memcpy(buf, data.str, data.len*sizeof(WCHAR));
buf[data.len] = 0;

18
modules/rostests/winetests/wininet/internet.c
View file

@ -510,7 +510,7 @@ static void test_complicated_cookie(void)
len = 1024;
ret = InternetGetCookieA("http://testing.example.com/bar/foo", NULL, buffer, &len);
ok(ret == TRUE,"InternetGetCookie failed\n");
ok(len == 24, "len = %u\n", 24);
ok(len == 24, "len = %u\n", len);
ok(strstr(buffer,"A=B")!=NULL,"A=B missing\n");
ok(strstr(buffer,"C=D")!=NULL,"C=D missing\n");
ok(strstr(buffer,"E=F")!=NULL,"E=F missing\n");
@ -524,16 +524,26 @@ static void test_complicated_cookie(void)
len = 1024;
ret = InternetGetCookieA("http://testing.example.com/bar/foo", "A", buffer, &len);
ok(ret == TRUE,"InternetGetCookie failed\n");
ok(len == 24, "len = %u\n", 24);
ok(len == 24, "len = %u\n", len);
/* test persistent cookies */
ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT");
ok(ret, "InternetSetCookie failed with error %d\n", GetLastError());
/* test invalid expires parameter */
ret = InternetSetCookieA("http://testing.example.com", NULL, "Q=R; expires=");
ok(ret, "InternetSetCookie failed %#x.\n", GetLastError());
len = 1024;
memset(buffer, 0xac, sizeof(buffer));
ret = InternetGetCookieA("http://testing.example.com/", NULL, buffer, &len);
ok(ret, "InternetGetCookie failed %#x.\n", GetLastError());
ok(len == 29, "got len %u.\n", len);
ok(!!strstr(buffer, "Q=R"), "cookie is not present.\n");
len = sizeof(buffer);
ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len);
ok(ret, "got error %u\n", GetLastError());
ok(len == 24, "got len %u\n", len);
ok(ret, "got error %#x\n", GetLastError());
ok(len == 29, "got len %u\n", len);
ok(!!strstr(buffer, "A=B"), "cookie is not present\n");
/* remove persistent cookie */

2
sdk/tools/winesync/wininet.cfg
View file

@ -5,4 +5,4 @@ files:
include/wininet.h: sdk/include/psdk/wininet.h
include/winineti.h: sdk/include/psdk/winineti.h
tags:
wine: d2a1c906dc4979eeabe256f77a58d67290da372d
wine: c06e00ee6a15fd77faf66b28edac5e84ad30b550