[vlc-commits] vout: fix uninitialized pointer dereference

Thomas Guillem git at videolan.org
Tue Apr 2 16:02:24 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Apr  2 15:52:09 2019 +0200| [3505ecb9d6b3edb4e68322cedb3dfe9ee895ff5b] | committer: Thomas Guillem

vout: fix uninitialized pointer dereference

A failing vout_Request() on a re-used vout caused to save an invalid vout
pointer.

This also fixes the following warning: ‘vout’ may be used uninitialized in this
function [-Wmaybe-uninitialized] input_resource_PutVout(p_resource, vout);

Regression from 4586ffaf28c0756e48d0fa607083417dda630a2d

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

 src/input/resource.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/resource.c b/src/input/resource.c
index e8fcd6d6d5..0812db6fe6 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -401,7 +401,7 @@ vout_thread_t *input_resource_GetVout(input_resource_t *p_resource,
 
     if (vout_Request(cfg, p_resource->p_input)) {
         vlc_mutex_unlock(&p_resource->lock);
-        input_resource_PutVout(p_resource, vout);
+        input_resource_PutVout(p_resource, cfg->vout);
         return NULL;
     }
 



More information about the vlc-commits mailing list