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

wininet: The URL in CommitUrlCacheEntryInternal shouldn't be restricted to MAX_PATH chars in length. 

Dynamically allocate it and consolidate cleanup at the end of the function.
This commit is contained in:
Rob Shearman 2008-03-12 16:40:58 +00:00 committed by Alexandre Julliard
parent cdd135c2f3
commit fee165ae47
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dlls/wininet/urlcache.c
View File

@ -2216,9 +2216,11 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
DWORD dwFileSizeLow = 0; DWORD dwFileSizeLow = 0;
DWORD dwFileSizeHigh = 0; DWORD dwFileSizeHigh = 0;
BYTE cDirectory = 0; BYTE cDirectory = 0;
int len;
char achFile[MAX_PATH]; char achFile[MAX_PATH];
char achUrl[MAX_PATH]; LPSTR lpszUrlNameA = NULL;
char *pchLocalFileName = 0; char *pchLocalFileName = 0;
DWORD error = ERROR_SUCCESS;
TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n",
debugstr_w(lpszUrlName), debugstr_w(lpszUrlName),
@ -2264,17 +2266,23 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) if (!(pHeader = URLCacheContainer_LockIndex(pContainer)))
return FALSE; return FALSE;
WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, achUrl, -1, NULL, NULL); len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL);
lpszUrlNameA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
if (URLCache_FindHash(pHeader, achUrl, &pHashEntry)) if (!lpszUrlNameA)
{
error = GetLastError();
goto cleanup;
}
WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, lpszUrlNameA, len, NULL, NULL);
if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry))
{ {
URLCacheContainer_UnlockIndex(pContainer, pHeader);
FIXME("entry already in cache - don't know what to do!\n"); FIXME("entry already in cache - don't know what to do!\n");
/* /*
* SetLastError(ERROR_FILE_NOT_FOUND); * SetLastError(ERROR_FILE_NOT_FOUND);
* return FALSE; * return FALSE;
*/ */
return TRUE; goto cleanup;
} }
if (lpszLocalFileName) if (lpszLocalFileName)
@ -2283,10 +2291,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
if (strncmpW(lpszLocalFileName, pContainer->path, lstrlenW(pContainer->path))) if (strncmpW(lpszLocalFileName, pContainer->path, lstrlenW(pContainer->path)))
{ {
URLCacheContainer_UnlockIndex(pContainer, pHeader);
ERR("path %s must begin with cache content path %s\n", debugstr_w(lpszLocalFileName), debugstr_w(pContainer->path)); ERR("path %s must begin with cache content path %s\n", debugstr_w(lpszLocalFileName), debugstr_w(pContainer->path));
SetLastError(ERROR_INVALID_PARAMETER); error = ERROR_INVALID_PARAMETER;
return FALSE; goto cleanup;
} }
/* skip container path prefix */ /* skip container path prefix */
@ -2306,18 +2313,18 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
if (!bFound) if (!bFound)
{ {
URLCacheContainer_UnlockIndex(pContainer, pHeader);
ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName));
SetLastError(ERROR_INVALID_PARAMETER); error = ERROR_INVALID_PARAMETER;
return FALSE; goto cleanup;
} }
lpszLocalFileName += (DIR_LENGTH + 1); /* "1234WXYZ\" */ lpszLocalFileName += (DIR_LENGTH + 1); /* "1234WXYZ\" */
} }
dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(achUrl) + 1); dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1);
if (lpszLocalFileName) if (lpszLocalFileName)
{ {
len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL);
dwOffsetLocalFileName = dwBytesNeeded; dwOffsetLocalFileName = dwBytesNeeded;
dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1); dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1);
} }
@ -2336,10 +2343,9 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
if (!URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry)) if (!URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry))
{ {
URLCacheContainer_UnlockIndex(pContainer, pHeader);
ERR("no free entries\n"); ERR("no free entries\n");
SetLastError(ERROR_DISK_FULL); error = ERROR_DISK_FULL;
return FALSE; goto cleanup;
} }
/* FindFirstFreeEntry fills in blocks used */ /* FindFirstFreeEntry fills in blocks used */
@ -2375,22 +2381,31 @@ static BOOL WINAPI CommitUrlCacheEntryInternal(
pUrlEntry->dwUnknown8 = 0; pUrlEntry->dwUnknown8 = 0;
strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lpszUrlNameA);
if (dwOffsetLocalFileName) if (dwOffsetLocalFileName)
strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1); strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1);
if (dwOffsetHeader) if (dwOffsetHeader)
memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize); memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize);
if (!URLCache_AddEntryToHash(pHeader, achUrl, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) if (!URLCache_AddEntryToHash(pHeader, lpszUrlNameA, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)))
{ {
URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry);
URLCacheContainer_UnlockIndex(pContainer, pHeader); URLCacheContainer_UnlockIndex(pContainer, pHeader);
HeapFree(GetProcessHeap(), 0, lpszUrlNameA);
return FALSE; return FALSE;
} }
cleanup:
URLCacheContainer_UnlockIndex(pContainer, pHeader); URLCacheContainer_UnlockIndex(pContainer, pHeader);
HeapFree(GetProcessHeap(), 0, lpszUrlNameA);
return TRUE; if (error == ERROR_SUCCESS)
return TRUE;
else
{
SetLastError(error);
return FALSE;
}
} }
/*********************************************************************** /***********************************************************************