]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
fixes conditional jump or move depending on uninitialised STACK value
authorDavid Vossel <dvossel@digium.com>
Wed, 25 Nov 2009 21:23:41 +0000 (21:23 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 25 Nov 2009 21:23:41 +0000 (21:23 +0000)
(closes issue #16261)
Reported by: edguy3
Patches:
      edguy16261.patch uploaded by edguy3 (license 917)

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

channels/chan_sip.c

index 48afb798bf047b7b3fec2d5b906457996368bc9c..2d2d899d707d18fcb50e61aba3be516f88c93eea 100644 (file)
@@ -5692,7 +5692,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
                        isin.sin_family = AF_INET;
                        isin.sin_port = htons(udptlportno);
                        if (ast_test_flag(&p->flags[0], SIP_NAT) && ast_test_flag(&p->flags[1], SIP_PAGE2_UDPTL_DESTINATION)) {
-                               struct sockaddr_in peer;
+                               struct sockaddr_in peer = { 0, };
                                ast_rtp_get_peer(p->rtp, &peer);
                                if (peer.sin_addr.s_addr) {
                                        memcpy(&isin.sin_addr, &peer.sin_addr, sizeof(isin.sin_addr));
@@ -16932,7 +16932,7 @@ restartsearch:
                                        (ast_rtp_get_rtptimeout(sip->rtp) || ast_rtp_get_rtpholdtimeout(sip->rtp)) &&
                                    (t > sip->lastrtprx + ast_rtp_get_rtptimeout(sip->rtp))) {
                                        /* Might be a timeout now -- see if we're on hold */
-                                       struct sockaddr_in sin;
+                                       struct sockaddr_in sin = { 0, };
                                        ast_rtp_get_peer(sip->rtp, &sin);
                                        if (!ast_test_flag(&sip->flags[1], SIP_PAGE2_CALL_ONHOLD) || 
                                            (ast_rtp_get_rtpholdtimeout(sip->rtp) &&