]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
(closes issue #13579)
authorSteve Murphy <murf@digium.com>
Fri, 3 Oct 2008 17:12:54 +0000 (17:12 +0000)
committerSteve Murphy <murf@digium.com>
Fri, 3 Oct 2008 17:12:54 +0000 (17:12 +0000)
Reported by: dwagner

(closes issue #13584)
Reported by: dwagner
Tested by: murf, putnopvut

The thought occurred to me that the res= from the extension spawn
was ending up being returned from the bridge.

"Thou shalt not poison the return value". Made the change
and it appears to allow blind xfers to work as normal.

If I'm wrong, reopen the bugs. But it looks good to me!

Many thanks to putnopvut for helping me reproduce this!

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

res/res_features.c

index ff66bf44e44d46326275af12801f8805c49b7a43..ce9b1d71716e4f16ba547caf3dbb9fc7408d320f 100644 (file)
@@ -1735,7 +1735,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                chan->priority = 1;
                ast_channel_unlock(chan);
                while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
-                       if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
+                       if (ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
                                /* Something bad happened, or a hangup has been requested. */
                                if (option_debug)
                                        ast_log(LOG_DEBUG, "Spawn h extension (%s,%s,%d) exited non-zero on '%s'\n", chan->context, chan->exten, chan->priority, chan->name);