[vlc-commits] file: do not attempt to open(NULL, ...); (fix #6796)

Rémi Denis-Courmont git at videolan.org
Sat May 12 18:40:01 CEST 2012


vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 12 19:38:27 2012 +0300| [c151aa4da0bb6402c54af507c8af8739fefcab15] | committer: Rémi Denis-Courmont

file: do not attempt to open(NULL, ...); (fix #6796)

(cherry picked from commit 9984e74dbff847645ae0e63db96bcd249568b7a4)

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

 modules/access/file.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/access/file.c b/modules/access/file.c
index b2ed9f1..44c5870 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -172,6 +172,8 @@ int FileOpen( vlc_object_t *p_this )
     {
         const char *path = p_access->psz_filepath;
 
+        if (unlikely(path == NULL))
+            return VLC_EGENERIC;
         msg_Dbg (p_access, "opening file `%s'", path);
         fd = vlc_open (path, O_RDONLY | O_NONBLOCK);
         if (fd == -1)



More information about the vlc-commits mailing list