[vlc-devel] [PATCH 6/5] se/archive: prevent potential call to archive_{entry, read}_free with NULL

Filip Roséen filip at atch.se
Fri Mar 17 11:26:30 CET 2017


---
 modules/stream_extractor/archive.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index 3106ea54a8..1e2f51fefd 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -322,8 +322,11 @@ static int archive_clean( private_sys_t* p_sys )
 {
     libarchive_t* p_arc = p_sys->p_archive;
 
-    archive_entry_free( p_sys->p_entry );
-    archive_read_free( p_arc );
+    if( p_sys->p_entry )
+        archive_entry_free( p_sys->p_entry );
+
+    if( p_arc )
+        archive_read_free( p_arc );
 
     p_sys->p_entry   = NULL;
     p_sys->p_archive = NULL;
-- 
2.12.0


More information about the vlc-devel mailing list