vlc/vlc-2.2 | branch: master | Gabriel de Perthuis <[email protected]> | Mon Sep 15 12:35:46 2014 +0200| [c64e079700df62bd2426445e8dc3de16d39f4bc3] | committer: Jean-Baptiste Kempf
Prevent potential null pointer dereference in zip access Close #12149 Close #13815 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 3c53c13138225c4b2414ab8358847197cf29b718) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c64e079700df62bd2426445e8dc3de16d39f4bc3 --- modules/access/zip/zipstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c index 8fd966d..8820a79 100644 --- a/modules/access/zip/zipstream.c +++ b/modules/access/zip/zipstream.c @@ -713,7 +713,7 @@ static node* findOrCreateParentNode( node *root, const char *fullpath ) while( current ) { - if( !strcmp( current->name, folder ) ) + if( current->name && !strcmp( current->name, folder ) ) { /* We found the folder, go recursively deeper */ node *parentNode = findOrCreateParentNode( current, sep ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
