[vlc-commits] livehttp: Fix crash on when not using encryption

Ilkka Ollakka git at videolan.org
Mon Mar 18 08:07:56 CET 2013


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Mar 18 09:05:35 2013 +0200| [ed49807fbafc6813bb8034e8245b7f3268556ea8] | committer: Ilkka Ollakka

livehttp: Fix crash on when not using encryption

Call CryptKey only if we actually are encrypting stuff

Fixes: #8315

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

 modules/access_output/livehttp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index cf5d6d7..ebb6b3a 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -673,7 +673,8 @@ static ssize_t openNextFile( sout_access_out_t *p_access, sout_access_out_sys_t
         return -1;
     }
 
-    CryptKey( p_access, i_newseg );
+    if( p_sys->key_uri )
+        CryptKey( p_access, i_newseg );
     msg_Dbg( p_access, "Successfully opened livehttp file: %s (%"PRIu32")" , psz_seg, i_newseg );
 
     //free( psz_seg );



More information about the vlc-commits mailing list