Skip to content

W
wine-winehq
Commit 1da9922a authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

msvcrt: Use parameter checking macros for string to number functions.

parent 14187ed2
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
dlls/msvcrt/string.c
View file @ 1da9922a
...@@ -206,8 +206,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca ...@@ -206,8 +206,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca
double ret; double ret;
BOOL found_digit = FALSE; BOOL found_digit = FALSE;
if(!str) { if (!MSVCRT_CHECK_PMT(str != NULL)) {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = MSVCRT_EINVAL; *MSVCRT__errno() = MSVCRT_EINVAL;
return 0; return 0;
} }
...@@ -529,8 +528,8 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR ...@@ -529,8 +528,8 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR
TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale);
if(!nptr || base<0 || base>36 || base==1) { if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) ||
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); !MSVCRT_CHECK_PMT(base <= 36)) {
return 0; return 0;
} }
...@@ -609,8 +608,8 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b ...@@ -609,8 +608,8 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale); TRACE("(%s %p %d %p)\n", nptr, endptr, base, locale);
if(!nptr || base<0 || base>36 || base==1) { if (!MSVCRT_CHECK_PMT(nptr != NULL) || !MSVCRT_CHECK_PMT(base == 0 || base >= 2) ||
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); !MSVCRT_CHECK_PMT(base <= 36)) {
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment