Skip to content

W
wine-cw
Commit c564ee82 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

wininet: Fix some string length calculations.

Fix some string length calculations that didn't account for the different sized characters with Unicode.
parent 4f40f172
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/wininet/urlcache.c
View file @ c564ee82
......@@ -943,8 +943,8 @@ static BOOL URLCache_CopyEntry(
lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0);
else
lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl);
dwRequiredSize += lenUrl + 1;
dwRequiredSize += (lenUrl + 1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR));
/* FIXME: is source url optional? */
if (*lpdwBufferSize >= dwRequiredSize)
{
......@@ -970,7 +970,7 @@ static BOOL URLCache_CopyEntry(
{
lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName;
}
dwRequiredSize += nLocalFilePathSize;
dwRequiredSize += nLocalFilePathSize * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)) ;
if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize))
ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment