summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2010-05-24 19:42:54 +0000
committerDavid Vossel <dvossel@digium.com>2010-05-24 19:42:54 +0000
commit94de6f3cb8d6447a5b0c378fea14c4ed9399fc36 (patch)
treebb6687176e44bafd9bcff42d3e7638fdd19f3995
parent3c9a8ebadb59ae5a906435c5767d85dae2d4f376 (diff)
reverses incorrect logic introduced by r243200
The decoding of the replace_id did not need to be broken up in this instance. This was brought to my attention again because it caused a segfault when the from or to tags were not present in the "Replaces" header. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9f34fff4c..e3a79fbac 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -20336,6 +20336,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
ast_debug(3, "INVITE part of call transfer. Replaces [%s]\n", p_replaces);
/* Create a buffer we can manipulate */
replace_id = ast_strdupa(p_replaces);
+ ast_uri_decode(replace_id);
if (!p->refer && !sip_refer_allocate(p)) {
transmit_response_reliable(p, "500 Server Internal Error", req);
@@ -20368,10 +20369,6 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
}
}
- ast_uri_decode(fromtag);
- ast_uri_decode(totag);
- ast_uri_decode(replace_id);
-
if (sipdebug)
ast_debug(4, "Invite/replaces: Will use Replace-Call-ID : %s Fromtag: %s Totag: %s\n",
replace_id,