[vlc-commits] mp4: fix NULL dereference (should fix LP#936488)

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 19 18:45:20 2012 +0200| [b893be200e3673fc62da020b3b2d21a986e8c450] | committer: Jean-Baptiste Kempf

mp4: fix NULL dereference (should fix LP#936488)
(cherry picked from commit 38a4fd744aee8b52d5cd3f5424b64b6d37ded6c0)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mp4/drms.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 39f4225..092e477 100644
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -325,7 +325,7 @@ int drms_init( void *_p_drms, uint32_t i_type,
             uint32_t p_priv[ 64 ];
             struct md5_s md5;
 
-            if( i_len < 64 )
+            if( i_len < 64 || p_drms->p_name == NULL )
             {
                 i_ret = -2;
                 break;