[FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: always release supported_props

gnattu gnattuoc at me.com
Sat Aug 10 09:06:42 EEST 2024


In vtenc_populate_extradata, supported_props should always be released
to avoid memory leak.

Regression from cd2f8a22e94700c68b1de7968df11e8bebfd315b

Signed-off-by: gnattu <gnattuoc at me.com>
---
 libavcodec/videotoolboxenc.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 78ef474d7ae..6cc45db4a96 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -2787,9 +2787,16 @@ pe_cleanup:
 
     if (status) {
         vtenc_reset(vtctx);
-    } else if (vtctx->session) {
-        CFRelease(vtctx->session);
-        vtctx->session = NULL;
+    } else {
+        if (vtctx->session) {
+            CFRelease(vtctx->session);
+            vtctx->session = NULL;
+        }
+
+        if (vtctx->supported_props) {
+            CFRelease(vtctx->supported_props);
+            vtctx->supported_props = NULL;
+        }
     }
 
     vtctx->frame_ct_out = 0;
-- 
2.39.3 (Apple Git-146)



More information about the ffmpeg-devel mailing list