doing <flash> *0 while on fxs causes Asterisk to crash (bug 2963)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4376 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index a205d7ae38f37b7bef7481e97728e24890a99e94..804c475df3f5fe6f8a4a6a7eb51ac105e3c210cd 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
+ -- chan_zap
+    -- seg fault fix
  -- rtp
-    -- fix for a seg fault
+    -- seg fault fix
  -- chan_sip
     -- fix to prevent seg fault when attempting a transfer
     -- fix bug with supervised transfers

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6745575a6aecda2c3681e7bc5dc31ae972971d16..eb5a60a888928d244268b5f29ca94c98306ecf0f 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5039,9 +5039,11 @@ static void *ss_thread(void *data)
                                        p->subs[SUB_THREEWAY].owner;
                                struct zt_pvt *pbridge = NULL;
                                  /* set up the private struct of the bridged one, if any */
-                               if (nbridge && nbridge->bridge) pbridge = nbridge->bridge->pvt->pvt;
-                               if (nbridge && 
-                                   (!strcmp(nbridge->type,"Zap")) &&
+                               if (nbridge && nbridge->bridge) 
+                                       pbridge = nbridge->bridge->pvt->pvt;
+                               if (nbridge && pbridge && 
+                                   (!strcmp(nbridge->type,"Zap")) && 
+                                       (!strcmp(nbridge->bridge->type, "Zap")) &&
                                    ISTRUNK(pbridge)) {
                                        int func = ZT_FLASH;
                                        /* Clear out the dial buffer */