Eric Pouech : msvcrt: Use parameter checking macros in wcstombs_s_l.
Alexandre Julliard
julliard at winehq.org
Mon Nov 1 11:54:34 CDT 2010
Module: wine
Branch: master
Commit: 4c337fb49164611a0b1842b1e7361e34768de968
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c337fb49164611a0b1842b1e7361e34768de968
Author: Eric Pouech <eric.pouech at orange.fr>
Date: Fri Oct 29 15:39:36 2010 +0200
msvcrt: Use parameter checking macros in wcstombs_s_l.
---
dlls/msvcrt/wcs.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 3dcfa1a..a100f31 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -298,8 +298,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
return 0;
}
- if(!wcstr || !mbstr) {
- MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+ if (!MSVCRT_CHECK_PMT(wcstr != NULL) || !MSVCRT_CHECK_PMT(mbstr != NULL)) {
if(mbstr && size)
mbstr[0] = '\0';
*MSVCRT__errno() = MSVCRT_EINVAL;
@@ -317,7 +316,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0'))
mbstr[conv-1] = '\0';
else {
- MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+ MSVCRT_INVALID_PMT("mbstr[size] is too small");
if(size)
mbstr[0] = '\0';
*MSVCRT__errno() = MSVCRT_ERANGE;
More information about the wine-cvs
mailing list