system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 08:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcrt: Set *end to NULL when strtod is called with NULL pointer string.

Browse source
This commit is contained in:
Sebastian Lackner 2015-06-29 03:42:34 +02:00 committed by Alexandre Julliard
parent ffcb4e0724
commit abbb361733
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/msvcrt/string.c
View file

@ -317,8 +317,11 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale
if(err)
*err = 0;
else
if(!MSVCRT_CHECK_PMT(str != NULL)) return 0;
else if(!MSVCRT_CHECK_PMT(str != NULL)) {
if (end)
*end = NULL;
return 0;
}
if(!locale)
locinfo = get_locinfo();

2
dlls/msvcrt/tests/string.c
View file

@ -1694,7 +1694,7 @@ static void test__strtod(void)
d = strtod(NULL, &end);
ok(almost_equal(d, 0.0), "d = %lf\n", d);
ok(errno == EINVAL, "errno = %x\n", errno);
todo_wine ok(!end, "incorrect end ptr %p\n", end);
ok(!end, "incorrect end ptr %p\n", end);
errno = EBADF;
d = p__strtod_l(NULL, NULL, NULL);