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

avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_AddFrame(). 

Perhaps the code should also just double the buffer. I can send another patch
for that if needed.
This commit is contained in:
Henri Verbeet 2010-01-05 21:29:02 +01:00 committed by Alexandre Julliard
parent 63aa5418c1
commit 7ab7103946
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/avifil32/avifile.c
View File

@ -1383,16 +1383,20 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW
}
if (This->idxFmtChanges == NULL || This->nIdxFmtChanges <= This->sInfo.dwFormatChangeCount) {
This->nIdxFmtChanges += 16;
if (This->idxFmtChanges == NULL)
DWORD new_count = This->nIdxFmtChanges + 16;
void *new_buffer;
if (This->idxFmtChanges == NULL) {
This->idxFmtChanges =
HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->nIdxFmtChanges * sizeof(AVIINDEXENTRY));
else
This->idxFmtChanges =
HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges,
This->nIdxFmtChanges * sizeof(AVIINDEXENTRY));
if (This->idxFmtChanges == NULL)
return AVIERR_MEMORY;
HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(AVIINDEXENTRY));
if (!This->idxFmtChanges) return AVIERR_MEMORY;
} else {
new_buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges,
new_count * sizeof(AVIINDEXENTRY));
if (!new_buffer) return AVIERR_MEMORY;
This->idxFmtChanges = new_buffer;
}
This->nIdxFmtChanges = new_count;
}
This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES;