vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu May 31 09:59:28 2018 +0200| [edf9c760190f52483ef49dcf084428f300522d10] | committer: Hugo Beauzée-Luyssen
live555: Fix potential null dereference Fix CD 4ad6cf87-d686-4199-bc1c-ba9c4b62ad77 (cherry picked from commit 1aaf923f49ae45323f8eef8d064a5fed1d3699e7) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=edf9c760190f52483ef49dcf084428f300522d10 --- modules/access/live555.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index e7e42bc6f4..5b7bb21787 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -1291,6 +1291,8 @@ static int Play( demux_t *p_demux ) *****************************************************************************/ static bool HasSharedSession( MediaSubsession *session ) { + if( session->sessionId() == NULL ) + return false; MediaSubsessionIterator *it = new MediaSubsessionIterator( session->parentSession() ); MediaSubsession *subsession; @@ -1299,7 +1301,8 @@ static bool HasSharedSession( MediaSubsession *session ) { if( session == subsession ) continue; - if( !strcmp( session->sessionId(), subsession->sessionId() ) ) + if( subsession->sessionId() != NULL && + !strcmp( session->sessionId(), subsession->sessionId() ) ) { b_shared = true; break; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
