Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

Merge pull request #463 from dragos-oancea/mod_vlc-nullptr-deref

Browse Source 
[mod_vlc] scan-build: Access to field 'context' results in a dereference of a null pointer (loaded from variable 'tech_pvt');
This commit is contained in:
Andrey Volk 2020-03-06 00:55:35 +04:00 committed by GitHub
commit efc9613d2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/formats/mod_vlc/mod_vlc.c
View File

@ -593,9 +593,12 @@ static switch_status_t av_init_handle(switch_file_handle_t *handle, switch_image
int argc = 2;
vlc_video_context_t *vcontext;
if (!acontext) {
return SWITCH_STATUS_FALSE;
}
opts[0] = *vlc_args;
if (acontext) opts[1] = switch_core_sprintf(acontext->pool, "--sout=%s", acontext->path);
opts[1] = switch_core_sprintf(acontext->pool, "--sout=%s", acontext->path);
pool = acontext->pool;
@ -2250,9 +2253,7 @@ static switch_status_t channel_on_consume_media(switch_core_session_t *session)
static switch_status_t channel_on_destroy(switch_core_session_t *session)
{
vlc_private_t *tech_pvt = switch_core_session_get_private(session);
switch_assert(tech_pvt && tech_pvt->context);
vlc_private_t *tech_pvt;
if ((tech_pvt = switch_core_session_get_private(session))) {
@ -2267,6 +2268,8 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
switch_media_handle_destroy(session);
}
switch_assert(tech_pvt && tech_pvt->context);
switch_yield(50000);
if (tech_pvt->context->mp) libvlc_media_player_stop(tech_pvt->context->mp);