From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 29 Apr 2016 12:51:45 +0000 (+0100)
Subject: st/omx: don't return early in vid_enc_EncodeFrame()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b1ea6910ee54afb30fd005eb1f8cf6f88338eda;p=mesa.git

st/omx: don't return early in vid_enc_EncodeFrame()

Earlier commit plugged a memory leak, although it missed a pair of
brackets. Thus we unconditionally returned even in the case of no error.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95203
Fixes: b87856d25d1 ("st/omx: Fix resource leak on OMX_ErrorNone")
Tested-by: Andy Furniss <adf.lists@gmail.com>
Acked-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
What an embarassing bug - missing brackets. Andy can you confirm that it
resolves the issue ?
---

diff --git a/src/gallium/state_trackers/omx/vid_enc.c b/src/gallium/state_trackers/omx/vid_enc.c
index de621662f45..5565241a615 100644
--- a/src/gallium/state_trackers/omx/vid_enc.c
+++ b/src/gallium/state_trackers/omx/vid_enc.c
@@ -1151,9 +1151,10 @@ static OMX_ERRORTYPE vid_enc_EncodeFrame(omx_base_PortType *port, OMX_BUFFERHEAD
    } else {
       /* ------- load input image into video buffer ---- */
       err = enc_LoadImage(port, buf, task->buf);
-      if (err != OMX_ErrorNone)
+      if (err != OMX_ErrorNone) {
          FREE(task);
          return err;
+      }
    }
 
    /* -------------- determine picture type --------- */