[asterisk-commits] dvossel: branch 1.4 r231233 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Nov 25 15:23:41 2009
New Revision: 231233

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231233
Log:
fixes conditional jump or move depending on uninitialised STACK value

(closes issue #16261)
Reported by: edguy3
Patches:
      edguy16261.patch uploaded by edguy3 (license 917)


Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=231233&r1=231232&r2=231233
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Wed Nov 25 15:23:41 2009
@@ -5692,7 +5692,7 @@
 			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 @@
 					(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) &&