kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent a crash in ExternalIVR when the 'S' command is sent first.

Browse Source 
If the first command sent from an ExternalIVR client is an 'S' command, we were
blindly removing the first element from the play list and deferencing it, even
if it was NULL.  This corrects that and also locks appropriately in one place.

(issue ASTERISK-17889)
Reported by: Chris Maciejewski
........

Merged revisions 362586 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 362587 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@362588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2012-04-19 16:10:04 +00:00
parent 772ad8a641
commit ba93541ced
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_externalivr.c
View File

@@ -683,13 +683,14 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
if (f->frametype == AST_FRAME_DTMF) { if (f->frametype == AST_FRAME_DTMF) {
send_eivr_event(eivr_events, f->subclass.integer, NULL, chan); send_eivr_event(eivr_events, f->subclass.integer, NULL, chan);
if (u->option_autoclear) { if (u->option_autoclear) {
AST_LIST_LOCK(&u->playlist);
if (!u->abort_current_sound && !u->playing_silence) { if (!u->abort_current_sound && !u->playing_silence) {
/* send interrupted file as T data */ /* send interrupted file as T data */
entry = AST_LIST_REMOVE_HEAD(&u->playlist, list); if ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
send_eivr_event(eivr_events, 'T', entry->filename, chan); send_eivr_event(eivr_events, 'T', entry->filename, chan);
ast_free(entry); ast_free(entry);
}
} }
AST_LIST_LOCK(&u->playlist);
while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) { while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
send_eivr_event(eivr_events, 'D', entry->filename, chan); send_eivr_event(eivr_events, 'D', entry->filename, chan);
ast_free(entry); ast_free(entry);
@@ -768,9 +769,10 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u,
AST_LIST_LOCK(&u->playlist); AST_LIST_LOCK(&u->playlist);
if (!u->abort_current_sound && !u->playing_silence) { if (!u->abort_current_sound && !u->playing_silence) {
/* send interrupted file as T data */ /* send interrupted file as T data */
entry = AST_LIST_REMOVE_HEAD(&u->playlist, list); if ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
send_eivr_event(eivr_events, 'T', entry->filename, chan); send_eivr_event(eivr_events, 'T', entry->filename, chan);
ast_free(entry); ast_free(entry);
}
} }
while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) { while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
send_eivr_event(eivr_events, 'D', entry->filename, chan); send_eivr_event(eivr_events, 'D', entry->filename, chan);