From: Mark Spencer <markster@digium.com>
Date: Tue, 18 Jan 2005 11:37:08 +0000 (+0000)
Subject: Fix recently introduced zap crash from HOLD/UNHOLD patch (bug #3365)
X-Git-Tag: 1.2.0-beta1~1366
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b0d0923b4a980fdce4c569808e2c05ee5db73bc;p=thirdparty%2Fasterisk.git

Fix recently introduced zap crash from HOLD/UNHOLD patch (bug #3365)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 36efc21764..c32149cb61 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -4392,12 +4392,11 @@ static int zt_indicate(struct ast_channel *chan, int condition)
 				chan->_softhangup |= AST_SOFTHANGUP_DEV;
 				res = 0;
 			} else if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
-				if (p->pri->pri) {		
+				if (p->pri) {		
 					if (!pri_grab(p, p->pri)) {
 						pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
 						pri_rel(p->pri);
-					}
-					else
+					} else
 						ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);
 				}
 				p->proceeding=1;
@@ -4408,10 +4407,22 @@ static int zt_indicate(struct ast_channel *chan, int condition)
 			break;
 #ifdef ZAPATA_PRI
 		case AST_CONTROL_HOLD:
-			res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_HOLD);
+			if (p->pri) {
+				if (!pri_grab(p, p->pri)) {
+					res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_HOLD);
+					pri_rel(p->pri);
+				} else
+						ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);			
+			}
 			break;
 		case AST_CONTROL_UNHOLD:
-			res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_RETRIEVAL);
+			if (p->pri) {
+				if (!pri_grab(p, p->pri)) {
+					res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_RETRIEVAL);
+					pri_rel(p->pri);
+				} else
+						ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);			
+			}
 			break;
 #endif
 		case AST_CONTROL_RADIO_KEY: