diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 23:14:50 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 23:14:50 +0000 |
| commit | aced442a629d81c7276bbd03698bed9a5db77816 (patch) | |
| tree | 64626b2cd2fe4bbbdf096af74e4a041d87b70e90 /res | |
| parent | 5827c440cd9b1f0134448f6cd220143c455ae805 (diff) | |
In reference to the fix made for 13871, I was
merging the fix into 1.6.0 and realized I missed
the code in the h-exten block, and didn't catch it
because my test case had the h-exten commented out.
So, this corrects the code I missed, as a
preventative against another crash report.
Tested with the h-exten defined, all is well.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@158603 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/res/res_features.c b/res/res_features.c index 31f3aa935..ad165b036 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1724,22 +1724,24 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP); ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP); if (res != AST_PBX_KEEPALIVE && !ast_test_flag(&(config->features_caller),AST_FEATURE_NO_H_EXTEN) && ast_exists_extension(chan, chan->context, "h", 1, chan->cid.cid_num)) { - struct ast_cdr *swapper; + struct ast_cdr *swapper = NULL; char savelastapp[AST_MAX_EXTENSION]; char savelastdata[AST_MAX_EXTENSION]; char save_exten[AST_MAX_EXTENSION]; int save_prio; - if (ast_opt_end_cdr_before_h_exten) { + if (bridge_cdr && ast_opt_end_cdr_before_h_exten) { ast_cdr_end(bridge_cdr); } /* swap the bridge cdr and the chan cdr for a moment, and let the endbridge dialplan code operate on it */ - swapper = chan->cdr; - ast_copy_string(savelastapp, bridge_cdr->lastapp, sizeof(bridge_cdr->lastapp)); - ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata)); ast_channel_lock(chan); - chan->cdr = bridge_cdr; + if (bridge_cdr) { + swapper = chan->cdr; + ast_copy_string(savelastapp, bridge_cdr->lastapp, sizeof(bridge_cdr->lastapp)); + ast_copy_string(savelastdata, bridge_cdr->lastdata, sizeof(bridge_cdr->lastdata)); + chan->cdr = bridge_cdr; + } ast_copy_string(save_exten, chan->exten, sizeof(save_exten)); ast_copy_string(chan->exten, "h", sizeof(chan->exten)); save_prio = chan->priority; @@ -1760,12 +1762,15 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast ast_channel_lock(chan); ast_copy_string(chan->exten, save_exten, sizeof(chan->exten)); chan->priority = save_prio; - chan->cdr = swapper; + if (bridge_cdr) + chan->cdr = swapper; ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN); ast_channel_unlock(chan); /* protect the lastapp/lastdata against the effects of the hangup/dialplan code */ - ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp)); - ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata)); + if (bridge_cdr) { + ast_copy_string(bridge_cdr->lastapp, savelastapp, sizeof(bridge_cdr->lastapp)); + ast_copy_string(bridge_cdr->lastdata, savelastdata, sizeof(bridge_cdr->lastdata)); + } } ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP); |