msvfw32: Simplify error handling in ICSeqCompressFrameStart.

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvfw32: Simplify error handling in ICSeqCompressFrameStart.
982fb2fd · Bruno Jesus · Alexandre Julliard · 4c80ec02 · 982fb2fd
Commit 982fb2fd authored Oct 19, 2015 by Bruno Jesus Committed by Alexandre Julliard Oct 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 15 deletions

msvideo_main.c dlls/msvfw32/msvideo_main.c +6 -15

No files found.
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -1433,28 +1433,18 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
    *pc->lpbiIn = *lpbiIn;
    pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage);
    if (!pc->lpBitsPrev)
-    {
+        goto error;
-        HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
-	return FALSE;
-    }
    pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS));
    if (!pc->lpState)
-    {
+        goto error;
-       HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
-       HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev);
-       return FALSE;
-    }
    pc->cbState = sizeof(ICCOMPRESS);
    pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage);
    if (!pc->lpBitsOut)
-    {
+        goto error;
-       HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
-       HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev);
-       HeapFree(GetProcessHeap(), 0, pc->lpState);
-       return FALSE;
-    }
    TRACE("Compvars:\n"
          "\tpc:\n"
          "\tsize: %i\n"
@@ -1483,6 +1473,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
       icComp->lpbiPrev = &pc->lpbiIn->bmiHeader;
       return TRUE;
    }
+error:
    HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
    HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev);
    HeapFree(GetProcessHeap(), 0, pc->lpState);