[PATCH 5/5] avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_ReadBlock().
Henri Verbeet
hverbeet at codeweavers.com
Mon Jan 4 14:33:14 CST 2010
---
dlls/avifil32/avifile.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 2d39659..c4f191a 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -2030,12 +2030,14 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos,
if (This->lpBuffer == NULL || This->cbBuffer < size) {
DWORD maxSize = max(size, This->sInfo.dwSuggestedBufferSize);
- if (This->lpBuffer == NULL)
+ if (This->lpBuffer == NULL) {
This->lpBuffer = HeapAlloc(GetProcessHeap(), 0, maxSize);
- else
- This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize);
- if (This->lpBuffer == NULL)
- return AVIERR_MEMORY;
+ if (!This->lpBuffer) return AVIERR_MEMORY;
+ } else {
+ void *new_buffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize);
+ if (!new_buffer) return AVIERR_MEMORY;
+ This->lpBuffer = new_buffer;
+ }
This->cbBuffer = maxSize;
}
--
1.6.4.4
More information about the wine-patches
mailing list