[vlc-commits] access: http: fix null dereference getting mime type

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 29 16:51:59 2015 +0200| [ec161656d2a33bcb1c3a79b7268cd18426cfac2f] | committer: Francois Cartegnie

access: http: fix null dereference getting mime type

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

 modules/access/http.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index 314a856..cb6ee0c 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -946,8 +946,10 @@ static int Control( access_t *p_access, int i_query, va_list args )
                 !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
                 /* Grrrr! detect ultravox server and force NSV demuxer */
                 *type = strdup( "video/nsa" );
-            else
+            else if( p_sys->psz_mime )
                 *type = strdup( p_sys->psz_mime );
+            else
+                return VLC_EGENERIC;
             break;
         }