[vlc-commits] resource: fix uninitialized pointer dereference

Thomas Guillem git at videolan.org
Thu May 9 17:16:57 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu May  9 15:31:29 2019 +0200| [9f668f760177a702ba706787d29953589188592f] | committer: Thomas Guillem

resource: fix uninitialized pointer dereference

This commit fixes a regression from a1924dbd8bb3e3c146ef150191dcf8ffa0be0a59
that (unintentionally) reverted 3505ecb9d6b3edb4e68322cedb3dfe9ee895ff5b

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

 src/input/resource.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/resource.c b/src/input/resource.c
index 56ce537753..80d27f462c 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -357,9 +357,9 @@ vout_thread_t *input_resource_GetVout(input_resource_t *p_resource,
 
     if (vout_Request(cfg, p_resource->p_input)) {
         if (p_resource->p_vout_free == NULL && p_resource->i_vout == 0)
-            p_resource->p_vout_free = vout;
+            p_resource->p_vout_free = cfg->vout;
         else
-            vout_Close(vout);
+            vout_Close(cfg->vout);
         vlc_mutex_unlock(&p_resource->lock);
         return NULL;
     }



More information about the vlc-commits mailing list