From dc17a4c1c8b4d2591b9ad8ca4bcf28e023730a23 Mon Sep 17 00:00:00 2001
From: Martin Pycko <martinp@digium.com>
Date: Fri, 21 Nov 2003 18:24:49 +0000
Subject: [PATCH] Don't crash if ZapHangup, ZapTransfer, ZapDialOffhook are
used on the channel that is onhook (idle)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_zap.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index dc1e8b02d1..0f21aacf0c 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3857,6 +3857,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
i->isidlecall = 0;
i->alreadyhungup = 0;
#endif
+ /* clear the fake event in case we posted one before we had ast_chanenl */
+ i->fake_event = 0;
/* Assure there is no confmute on this channel */
zt_confmute(i, 0);
if (startpbx) {
@@ -6814,6 +6816,10 @@ static int action_transfer(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
+ if (p->owner && p->owner->_state != AST_STATE_UP) {
+ astman_send_error(s, m, "Channel is on hook");
+ return 0;
+ }
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;
@@ -6832,6 +6838,10 @@ static int action_transferhangup(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
+ if (p->owner && p->owner->_state != AST_STATE_UP) {
+ astman_send_error(s, m, "Channel is on hook");
+ return 0;
+ }
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;
@@ -6856,6 +6866,15 @@ static int action_zapdialoffhook(struct mansession *s, struct message *m)
return 0;
}
p = find_channel(atoi(channel));
+ if (p->owner) {
+ if (p->owner->_state != AST_STATE_UP) {
+ astman_send_error(s, m, "Channel is on hook");
+ return 0;
+ }
+ } else {
+ astman_send_error(s, m, "Channel does not have it's owner");
+ return 0;
+ }
if (!p) {
astman_send_error(s, m, "No such channel");
return 0;
--
GitLab