urlmon: Fix possible NULL pointer access in heap_strdup*.
This commit is contained in:
parent
c02b84d3c5
commit
78b08cdabd
|
@ -261,6 +261,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
|
|||
|
||||
size = (strlenW(str)+1)*sizeof(WCHAR);
|
||||
ret = heap_alloc(size);
|
||||
if(ret)
|
||||
memcpy(ret, str, size);
|
||||
}
|
||||
|
||||
|
@ -289,6 +290,7 @@ static inline LPWSTR heap_strdupAtoW(const char *str)
|
|||
if(str) {
|
||||
DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
|
||||
ret = heap_alloc(len*sizeof(WCHAR));
|
||||
if(ret)
|
||||
MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
|
||||
}
|
||||
|
||||
|
@ -302,6 +304,7 @@ static inline char *heap_strdupWtoA(const WCHAR *str)
|
|||
if(str) {
|
||||
size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
|
||||
ret = heap_alloc(size);
|
||||
if(ret)
|
||||
WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue