Piotr Caban : msvcrt: Fix strtol implementation on strings not containing valid number.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 8 07:49:56 CDT 2015
Module: wine
Branch: master
Commit: 0922865b377913a27cea568ac688787a8117d8a7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0922865b377913a27cea568ac688787a8117d8a7
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Jun 8 12:00:55 2015 +0200
msvcrt: Fix strtol implementation on strings not containing valid number.
---
dlls/msvcrt/string.c | 10 ++++++++--
dlls/msvcrt/tests/string.c | 8 ++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 6f9280f..fdeb4e0 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -839,7 +839,9 @@ MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen)
*/
__int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale)
{
+ const char *p = nptr;
BOOL negative = FALSE;
+ BOOL got_digit = FALSE;
__int64 ret = 0;
TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale);
@@ -881,6 +883,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR
break;
v = cur-'a'+10;
}
+ got_digit = TRUE;
if(negative)
v = -v;
@@ -898,7 +901,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR
}
if(endptr)
- *endptr = (char*)nptr;
+ *endptr = (char*)(got_digit ? nptr : p);
return ret;
}
@@ -1014,7 +1017,9 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base)
*/
unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int base, MSVCRT__locale_t locale)
{
+ const char *p = nptr;
BOOL negative = FALSE;
+ BOOL got_digit = FALSE;
unsigned __int64 ret = 0;
TRACE("(%s %p %d %p)\n", debugstr_a(nptr), endptr, base, locale);
@@ -1056,6 +1061,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
break;
v = cur-'a'+10;
}
+ got_digit = TRUE;
nptr++;
@@ -1067,7 +1073,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
}
if(endptr)
- *endptr = (char*)nptr;
+ *endptr = (char*)(got_digit ? nptr : p);
return negative ? -ret : ret;
}
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 3893ba7..9920df0 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -1401,6 +1401,8 @@ static void test_strtok(void)
static void test_strtol(void)
{
+ static char neg[] = "-0x";
+
char* e;
LONG l;
ULONG ul;
@@ -1457,6 +1459,12 @@ static void test_strtol(void)
ul = strtoul("-4294967296", NULL, 0);
ok(ul == 1, "wrong value %u\n", ul);
ok(errno == ERANGE, "wrong errno %d\n", errno);
+
+ errno = 0;
+ l = strtol(neg, &e, 0);
+ ok(l == 0, "wrong value %d\n", l);
+ ok(errno == 0, "wrong errno %d\n", errno);
+ ok(e == neg, "e = %p, neg = %p\n", e, neg);
}
static void test_strnlen(void)
More information about the wine-cvs
mailing list