[vlc-commits] vaapi: fix crash on error case

Jean-Baptiste Kempf git at videolan.org
Sun Dec 3 23:13:28 CET 2017


vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec  3 18:54:33 2017 +0100| [a92fb5e63ef9f8611c65d25964e260b789bc2a81] | committer: Jean-Baptiste Kempf

vaapi: fix crash on error case

Regression from f0c3cef078963f848e961088d452c488c88f4f7a

Close #19204

(cherry picked from commit 10a562ee149e199529f917e53da9c4fc902cf629)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a92fb5e63ef9f8611c65d25964e260b789bc2a81
---

 modules/video_output/opengl/converter_vaapi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index 4f99b266c7..6fb1a6e3d6 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -305,7 +305,8 @@ Close(vlc_object_t *obj)
     if (priv->last.pic != NULL)
         vaegl_release_last_pic(tc, priv);
 
-    vlc_vaapi_ReleaseInstance(priv->vainst);
+    if (priv->vainst)
+        vlc_vaapi_ReleaseInstance(priv->vainst);
 
     free(tc->priv);
 }



More information about the vlc-commits mailing list