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

wininet: Fix some string length calculations. 

Fix some string length calculations that didn't account for the
different sized characters with Unicode.
This commit is contained in:
Robert Shearman 2006-03-30 19:55:36 +01:00 committed by Alexandre Julliard
parent 4f40f17226
commit c564ee826f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wininet/urlcache.c
View File

@ -943,8 +943,8 @@ static BOOL URLCache_CopyEntry(
lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0);
else else
lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl);
dwRequiredSize += lenUrl + 1; dwRequiredSize += (lenUrl + 1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR));
/* FIXME: is source url optional? */ /* FIXME: is source url optional? */
if (*lpdwBufferSize >= dwRequiredSize) if (*lpdwBufferSize >= dwRequiredSize)
{ {
@ -970,7 +970,7 @@ static BOOL URLCache_CopyEntry(
{ {
lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName;
} }
dwRequiredSize += nLocalFilePathSize; dwRequiredSize += nLocalFilePathSize * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)) ;
if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize))
ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4)); ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4));