|
@@ -170,7 +170,7 @@ int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, int
|
|
|
|
|
|
if (cbMultiByte == -1)
|
|
|
{
|
|
|
- size_t len = strnlen((const char*)lpMultiByteStr, INT32_MAX);
|
|
|
+ size_t len = lpMultiByteStr ? strnlen((const char*)lpMultiByteStr, INT32_MAX) : INT32_MAX;
|
|
|
if (len >= INT32_MAX)
|
|
|
return 0;
|
|
|
cbMultiByte = (int)len + 1;
|
|
@@ -296,7 +296,7 @@ int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr, int
|
|
|
|
|
|
if (cchWideChar == -1)
|
|
|
{
|
|
|
- size_t len = _wcslen(lpWideCharStr);
|
|
|
+ size_t len = lpWideCharStr ? _wcslen(lpWideCharStr) : INT32_MAX;
|
|
|
if (len >= INT32_MAX)
|
|
|
return 0;
|
|
|
cchWideChar = (int)len + 1;
|