kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional checks for NULL pointers to fix several crashes reported.

Browse Source 
ASTERISK-24304 #close
Reported by: dhanapathy sathya
........

Merged revisions 426666 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 426667 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 426668 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@426669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Igor Goncharovskiy
2014-10-30 06:15:14 +00:00
parent 0ddc3bde24
commit c866ced76b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_unistim.c
View File

@@ -2634,6 +2634,9 @@ static void *unistim_ss(void *data)
struct unistimsession *s = l->parent->session;
int res;
if (!s) {
return NULL;
}
ast_verb(3, "Starting switch on '%s@%s-%d' to %s\n", l->name, l->parent->name, sub->softkey, s->device->phone_number);
ast_channel_lock(chan);
ast_channel_exten_set(chan, s->device->phone_number);
@@ -3404,6 +3407,9 @@ static void key_call(struct unistimsession *pte, char keycode)
struct unistim_subchannel *sub = get_sub(pte->device, SUB_REAL);
struct unistim_subchannel *sub_3way = get_sub(pte->device, SUB_THREEWAY);
if (!sub) {
return;
}
if ((keycode >= KEY_0) && (keycode <= KEY_SHARP)) {
if (keycode == KEY_SHARP) {
keycode = '#';
@@ -3417,7 +3423,7 @@ static void key_call(struct unistimsession *pte, char keycode)
}
switch (keycode) {
case KEY_FUNC1:
if (ast_channel_state(sub->owner) == AST_STATE_UP) {
if (sub->owner && ast_channel_state(sub->owner) == AST_STATE_UP) {
if (sub_3way) {
close_call(pte);
}