Add additional checks for NULL pointers to fix several crashes reported.
authorIgor Goncharovskiy <igor.goncharovsky@gmail.com>
Thu, 30 Oct 2014 06:15:14 +0000 (06:15 +0000)
committerIgor Goncharovskiy <igor.goncharovsky@gmail.com>
Thu, 30 Oct 2014 06:15:14 +0000 (06:15 +0000)
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

channels/chan_unistim.c

index 91cc402..3dca9e8 100644 (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);
                        }