Merged revisions 321042 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Thu, 26 May 2011 17:35:55 +0000 (17:35 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 26 May 2011 17:35:55 +0000 (17:35 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321042 | twilson | 2011-05-26 10:29:54 -0700 (Thu, 26 May 2011) | 6 lines

  Initialize stack-allocated ast_sockaddrs before use

  It is important to always initialize ast_sockaddrs before use--even if they
  are passed to ast_sockaddr_copy as the underlying storage could be bigger
  than what ends up being copied--leaving part of the data unitialized.
........

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

main/rtp_engine.c

index acd6c4a..3c5ef8b 100644 (file)
@@ -1282,7 +1282,7 @@ enum ast_bridge_result ast_rtp_instance_bridge(struct ast_channel *c0, struct as
                        *vinstance0 = NULL, *vinstance1 = NULL,
                        *tinstance0 = NULL, *tinstance1 = NULL;
        struct ast_rtp_glue *glue0, *glue1;
-       struct ast_sockaddr addr1, addr2;
+       struct ast_sockaddr addr1 = { {0, }, }, addr2 = { {0, }, };
        enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
        enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
        enum ast_bridge_result res = AST_BRIDGE_FAILED;