hwcontext_vaapi: avoid fd leak in vaapi_device_derive

5 years ago · d951eea6fd
parent 9faae05ddf
commit d951eea6fd
1 changed files with 6 additions and 1 deletions
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@ -1678,8 +1678,13 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx,
 #endif

        priv = av_mallocz(sizeof(*priv));
-        if (!priv)
+        if (!priv) {
+            if (fd != src_hwctx->fd) {
+                // The fd was opened in this function.
+                close(fd);
+            }
            return AVERROR(ENOMEM);
+        }

        if (fd == src_hwctx->fd) {
            // The fd is inherited from the source context and we are holding