[vlc-commits] stream_extractor/archive: Check for NULL return of archive_entry_pathname

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Jan  5 17:11:06 2018 +0100| [b0ca70472bb181f4f76524feb9251630040a2dd9] | committer: Jean-Baptiste Kempf

stream_extractor/archive: Check for NULL return of archive_entry_pathname

Fixes CD 2a1e0ab3-e9d5-433c-afd8-ec56e6a8968f

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

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

 modules/stream_extractor/archive.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index 4fdb3b1378..9396c34c3e 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -516,6 +516,10 @@ static int ReadDir( stream_directory_t* p_directory, input_item_node_t* p_node )
             continue;
 
         char const* path = archive_entry_pathname( entry );
+
+        if( unlikely( !path ) )
+            break;
+
         char*       mrl  = vlc_stream_extractor_CreateMRL( p_directory, path );
 
         if( unlikely( !mrl ) )