From: Matthew Nicholson <mnicholson@digium.com>
Date: Thu, 24 Feb 2011 15:06:14 +0000 (+0000)
Subject: Merged revisions 308722 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~308
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb1f856e88996a9c5049b1974d1bc3b95d1c3db2;p=thirdparty%2Fasterisk.git

Merged revisions 308722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r308722 | mnicholson | 2011-02-24 08:59:41 -0600 (Thu, 24 Feb 2011) | 9 lines

  Merged revisions 308721 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r308721 | mnicholson | 2011-02-24 08:54:56 -0600 (Thu, 24 Feb 2011) | 2 lines

    silence gcc 4.2 compiler warning
  ........
................


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

diff --git a/main/udptl.c b/main/udptl.c
index fb87dc00aa..f172c33ef7 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -321,9 +321,9 @@ static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, unsigned int len)
 	unsigned int count;
 	int total_count;
 	int seq_no;
-	const uint8_t *ifp;
-	const uint8_t *data;
-	unsigned int ifp_len;
+	const uint8_t *ifp = NULL;
+	const uint8_t *data = NULL;
+	unsigned int ifp_len = 0;
 	int repaired[16];
 	const uint8_t *bufs[ARRAY_LEN(s->f) - 1];
 	unsigned int lengths[ARRAY_LEN(s->f) - 1];