Module: wine Branch: master Commit: bafe54e7e515d88cd3cd3a7b7cdb64222fe9afd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafe54e7e515d88cd3cd3a7b7c...
Author: André Hentschel nerv@dawncrow.de Date: Sat Nov 17 22:49:49 2012 +0100
advpack: Fix possible NULL pointer access in heap_strdupWtoA.
---
dlls/advpack/advpack_private.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index a1bcfe4..5d74897 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -44,7 +44,8 @@ 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); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); }
return ret;