aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-08 15:27:06 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-08 15:27:06 +0000
commitaf77db66f108cca8d55f0fb8bfff03b589e2f47d (patch)
tree9e37b0699540e405b3fbb9a15c78b7fd771ad01f
parent94feaed830be08912a8fe13313e50573026f29ee (diff)
Merged revisions 115552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r115552 | russell | 2008-05-08 10:26:49 -0500 (Thu, 08 May 2008) | 12 lines Merged revisions 115551 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r115551 | russell | 2008-05-08 10:24:54 -0500 (Thu, 08 May 2008) | 4 lines Don't use a channel before checking for channel allocation failure. (closes issue #12609) Reported by: edantie ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115553 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/pbx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/main/pbx.c b/main/pbx.c
index f2121933c..e191710ca 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6096,13 +6096,13 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex
the PBX, we have to make a new channel, masquerade, and start the PBX
at the new location */
struct ast_channel *tmpchan = ast_channel_alloc(0, chan->_state, 0, 0, chan->accountcode, chan->exten, chan->context, chan->amaflags, "AsyncGoto/%s", chan->name);
- if (chan->cdr) {
- ast_cdr_discard(tmpchan->cdr);
- tmpchan->cdr = ast_cdr_dup(chan->cdr); /* share the love */
- }
- if (!tmpchan)
+ if (!tmpchan) {
res = -1;
- else {
+ } else {
+ if (chan->cdr) {
+ ast_cdr_discard(tmpchan->cdr);
+ tmpchan->cdr = ast_cdr_dup(chan->cdr); /* share the love */
+ }
/* Make formats okay */
tmpchan->readformat = chan->readformat;
tmpchan->writeformat = chan->writeformat;