Yeah, those brackets were very much missing.

Ack.

On 04/29/2016 08:56 AM, Emil Velikov wrote:
From: Emil Velikov <emil.veli...@collabora.com>

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")
Cc: Andy Furniss <adf.li...@gmail.com>
Cc: Robert Foss <robert.f...@collabora.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
What an embarassing bug - missing brackets. Andy can you confirm that it
resolves the issue ?
---
  src/gallium/state_trackers/omx/vid_enc.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/omx/vid_enc.c 
b/src/gallium/state_trackers/omx/vid_enc.c
index de62166..5565241 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 --------- */

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to