ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Locate where a buffer size is not being set and correctly handle the 

buffer size conversion from W to A (with help from Robert Shearman).
This commit is contained in:
Aric Stewart 2005-06-03 11:24:57 +00:00 committed by Alexandre Julliard
parent eb6559f910
commit 4d1ce166ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/msi/msi.c
View File

@ -462,6 +462,7 @@ UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute,
{ {
LPWSTR szwProduct = NULL, szwAttribute = NULL, szwBuffer = NULL; LPWSTR szwProduct = NULL, szwAttribute = NULL, szwBuffer = NULL;
UINT r = ERROR_OUTOFMEMORY; UINT r = ERROR_OUTOFMEMORY;
DWORD pcchwValueBuf = 0;
TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szAttribute), TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szAttribute),
szBuffer, pcchValueBuf); szBuffer, pcchValueBuf);
@ -483,14 +484,17 @@ UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute,
if( szBuffer ) if( szBuffer )
{ {
szwBuffer = HeapAlloc( GetProcessHeap(), 0, (*pcchValueBuf) * sizeof(WCHAR) ); szwBuffer = HeapAlloc( GetProcessHeap(), 0, (*pcchValueBuf) * sizeof(WCHAR) );
pcchwValueBuf = *pcchValueBuf;
if( !szwBuffer ) if( !szwBuffer )
goto end; goto end;
} }
r = MsiGetProductInfoW( szwProduct, szwAttribute, szwBuffer, pcchValueBuf ); r = MsiGetProductInfoW( szwProduct, szwAttribute, szwBuffer,
&pcchwValueBuf );
if( ERROR_SUCCESS == r ) if( ERROR_SUCCESS == r )
WideCharToMultiByte(CP_ACP, 0, szwBuffer, -1, szBuffer, *pcchValueBuf, NULL, NULL); *pcchValueBuf = WideCharToMultiByte(CP_ACP, 0, szwBuffer, pcchwValueBuf,
szBuffer, *pcchValueBuf, NULL, NULL);
end: end:
HeapFree( GetProcessHeap(), 0, szwProduct ); HeapFree( GetProcessHeap(), 0, szwProduct );
@ -569,6 +573,8 @@ UINT WINAPI MsiGetProductInfoW(LPCWSTR szProduct, LPCWSTR szAttribute,
FIXME("0 (zero) if advertised, 1(one) if per machine.\n"); FIXME("0 (zero) if advertised, 1(one) if per machine.\n");
if (szBuffer) if (szBuffer)
szBuffer[0] = 1; szBuffer[0] = 1;
if (pcchValueBuf)
*pcchValueBuf = 1;
r = ERROR_SUCCESS; r = ERROR_SUCCESS;
} }
else else