[vlc-commits] demux: call vlc_objres_clear() on error

Rémi Denis-Courmont git at videolan.org
Mon Mar 4 21:05:45 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar  4 21:03:45 2019 +0200| [b209d29ebc2df6b5aeb574d61116ae944eb45676] | committer: Rémi Denis-Courmont

demux: call vlc_objres_clear() on error

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

 src/input/demux.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index a5fd8e0890..c3689c65bc 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -175,8 +175,11 @@ static int demux_Probe(void *func, bool forced, va_list ap)
         return VLC_EGENERIC;
     }
 
+    int ret = probe(VLC_OBJECT(demux));
+    if (ret)
+        vlc_objres_clear(VLC_OBJECT(demux));
     (void) forced;
-    return probe(VLC_OBJECT(demux));
+    return ret;
 }
 
 demux_t *demux_NewAdvanced( vlc_object_t *p_obj, input_thread_t *p_input,



More information about the vlc-commits mailing list