[Asterisk-cvs] asterisk/channels chan_zap.c,1.400,1.401

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv1548/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix recently introduced zap crash from HOLD/UNHOLD patch (bug #3365)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- chan_zap.c	17 Jan 2005 12:37:55 -0000	1.400
+++ chan_zap.c	18 Jan 2005 11:37:08 -0000	1.401
@@ -4392,12 +4392,11 @@
 				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 @@
 			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: