marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Don't test buffer length if buffer is null.

oldstable
Dan Kegel 2008-05-26 19:58:49 -07:00 committed by Alexandre Julliard
parent a4c10fda8e
commit 0161606b53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/advapi32/service.c
View File

@ -1811,7 +1811,7 @@ BOOL WINAPI GetServiceKeyNameA( SC_HANDLE hSCManager, LPCSTR lpDisplayName,
sizeW = *lpcchBuffer; sizeW = *lpcchBuffer;
if (!GetServiceKeyNameW(hSCManager, lpDisplayNameW, lpServiceNameW, &sizeW)) if (!GetServiceKeyNameW(hSCManager, lpDisplayNameW, lpServiceNameW, &sizeW))
{ {
if (*lpcchBuffer && lpServiceName) if (lpServiceName && *lpcchBuffer)
lpServiceName[0] = 0; lpServiceName[0] = 0;
*lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */ *lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */
goto cleanup; goto cleanup;
@ -1922,7 +1922,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
sizeW = *lpcchBuffer; sizeW = *lpcchBuffer;
if (!GetServiceDisplayNameW(hSCManager, lpServiceNameW, lpDisplayNameW, &sizeW)) if (!GetServiceDisplayNameW(hSCManager, lpServiceNameW, lpDisplayNameW, &sizeW))
{ {
if (*lpcchBuffer && lpDisplayName) if (lpDisplayName && *lpcchBuffer)
lpDisplayName[0] = 0; lpDisplayName[0] = 0;
*lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */ *lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */
goto cleanup; goto cleanup;