Eric Pouech : msvcrt: Use parameter validation macros for mcstowcs_s_l.
Alexandre Julliard
julliard at winehq.org
Mon Nov 1 11:54:34 CDT 2010
Module: wine
Branch: master
Commit: 8583bd317e25e42df592de56249997bb931a465a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8583bd317e25e42df592de56249997bb931a465a
Author: Eric Pouech <eric.pouech at orange.fr>
Date: Fri Oct 29 15:39:08 2010 +0200
msvcrt: Use parameter validation macros for mcstowcs_s_l.
---
dlls/msvcrt/mbcs.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index d92365f..5767242 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1824,8 +1824,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
return 0;
}
- if(!mbstr || !wcstr) {
- MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+ if(!MSVCRT_CHECK_PMT(mbstr != NULL) || !MSVCRT_CHECK_PMT(wcstr != NULL)) {
if(wcstr && size)
wcstr[0] = '\0';
*MSVCRT__errno() = MSVCRT_EINVAL;
@@ -1843,7 +1842,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0'))
wcstr[conv-1] = '\0';
else {
- MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+ MSVCRT_INVALID_PMT("wcstr[size] is too small");
if(size)
wcstr[0] = '\0';
*MSVCRT__errno() = MSVCRT_ERANGE;
More information about the wine-cvs
mailing list