summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2011-10-24 22:09:11 +0000
committerJonathan Rose <jrose@digium.com>2011-10-24 22:09:11 +0000
commitf6cd5af36bee371a7bbefd1d39946bc609b14218 (patch)
tree0f413f6e333b3ba4d1acd39cf0c97dd01dbdb025 /main
parent3e9f1ee3e0dbe56596d3a97ff346a9b84e3501dc (diff)
Fixes a segfault caused by referencing null frames introduced in r338623
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/features.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c
index af4e5f441..43dec798f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -4053,11 +4053,11 @@ int ast_bridge_call(struct ast_channel *chan, struct ast_channel *peer, struct a
digits to come in for features. */
ast_debug(1, "Timed out for feature!\n");
if (!ast_strlen_zero(peer_featurecode)) {
- ast_dtmf_stream(chan, peer, peer_featurecode, 0, f->len);
+ ast_dtmf_stream(chan, peer, peer_featurecode, 0, f ? f->len : 0);
memset(peer_featurecode, 0, sizeof(peer_featurecode));
}
if (!ast_strlen_zero(chan_featurecode)) {
- ast_dtmf_stream(peer, chan, chan_featurecode, 0, f->len);
+ ast_dtmf_stream(peer, chan, chan_featurecode, 0, f ? f->len : 0);
memset(chan_featurecode, 0, sizeof(chan_featurecode));
}
if (f)