automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8968450b40682a061f2b1ee71a65390bee53b0a5..7e50694de8c3089348f9ca52bd340ac25508a0de 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6918,12 +6918,14 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq)
                        return -1;
                }
                from += 4;
+               if (pedanticsipchecking) {
+                       ast_uri_decode(from);
+               }
        } else
                from = NULL;
 
        if (pedanticsipchecking) {
                ast_uri_decode(uri);
-               ast_uri_decode(from);
        }
 
        /* Get the target domain first and user */
@@ -7348,11 +7350,10 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
        while(*t && (*t > 32) && (*t != ';'))
                t++;
        *t = '\0';
-       of = get_header(req, "From");
-       if (pedanticsipchecking)
-               ast_uri_decode(of);
 
-       ast_copy_string(from, of, sizeof(from));
+       ast_copy_string(from, get_header(req, "From"), sizeof(from));
+       if (pedanticsipchecking)
+               ast_uri_decode(from);
        
        memset(calleridname,0,sizeof(calleridname));
        get_calleridname(from, calleridname, sizeof(calleridname));