Skip to content

W
wine-cw
Commit 5b435796 authored by Bartosz Kosiorek's avatar Bartosz Kosiorek Committed by Alexandre Julliard
Browse files
Options

msvcrt: Fix error handling for strcpy_s.

parent 046bed65
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/msvcrt/string.c
View file @ 5b435796
...@@ -1328,9 +1328,9 @@ char* CDECL strcpy(char *dst, const char *src) ...@@ -1328,9 +1328,9 @@ char* CDECL strcpy(char *dst, const char *src)
int CDECL strcpy_s( char* dst, size_t elem, const char* src ) int CDECL strcpy_s( char* dst, size_t elem, const char* src )
{ {
size_t i; size_t i;
if(!elem) return EINVAL; if (!MSVCRT_CHECK_PMT(dst != 0)) return EINVAL;
if(!dst) return EINVAL; if (!MSVCRT_CHECK_PMT(elem != 0)) return EINVAL;
if(!src) if (!MSVCRT_CHECK_PMT(src != NULL))
{ {
dst[0] = '\0'; dst[0] = '\0';
return EINVAL; return EINVAL;
...@@ -1340,6 +1340,7 @@ int CDECL strcpy_s( char* dst, size_t elem, const char* src ) ...@@ -1340,6 +1340,7 @@ int CDECL strcpy_s( char* dst, size_t elem, const char* src )
{ {
if((dst[i] = src[i]) == '\0') return 0; if((dst[i] = src[i]) == '\0') return 0;
} }
MSVCRT_INVALID_PMT("dst[elem] is too small", ERANGE);
dst[0] = '\0'; dst[0] = '\0';
return ERANGE; return ERANGE;
} }
......
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