aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2017-01-26 21:06:04 -0700
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:32:07 +0200
commit8872ab4e6c8c9e06985d14aff562fa2daf80eb62 (patch)
tree075ba2661688bb7fe112513de235749a9e55f95d
parentb7454f3b1263d7a8775577318d3c60e884f424fb (diff)
net: netfilter: fix maybe-uninitialized warning
net/netfilter/nf_conntrack_h323_main.c: In function 'h245_help': net/netfilter/nf_conntrack_h323_main.c:178:11: warning: 'dataoff' may be used uninitialized in this function [-Wmaybe-uninitialized] tpktoff = *dataoff + *datalen; ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:588:6: note: 'dataoff' was declared here int dataoff; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c:182:18: warning: 'datalen' may be used uninitialized in this function [-Wmaybe-uninitialized] tpkt = *data + *datalen; ^~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:587:6: note: 'datalen' was declared here int datalen; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c: In function 'q931_help': net/netfilter/nf_conntrack_h323_main.c:178:11: warning: 'dataoff' may be used uninitialized in this function [-Wmaybe-uninitialized] tpktoff = *dataoff + *datalen; ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:1163:6: note: 'dataoff' was declared here int dataoff; ^~~~~~~ net/netfilter/nf_conntrack_h323_main.c:182:18: warning: 'datalen' may be used uninitialized in this function [-Wmaybe-uninitialized] tpkt = *data + *datalen; ^~~~~~~~ net/netfilter/nf_conntrack_h323_main.c:1162:6: note: 'datalen' was declared here int datalen; ^~~~~~~ Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
-rw-r--r--net/netfilter/nf_conntrack_h323_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 70866d192..2b7ae4174 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -584,8 +584,8 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff,
{
static MultimediaSystemControlMessage mscm;
unsigned char *data = NULL;
- int datalen;
- int dataoff;
+ int datalen = 0;
+ int dataoff = 0;
int ret;
/* Until there's been traffic both ways, don't look in packets. */
@@ -1159,8 +1159,8 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff,
{
static Q931 q931;
unsigned char *data = NULL;
- int datalen;
- int dataoff;
+ int datalen = 0;
+ int dataoff = 0;
int ret;
/* Until there's been traffic both ways, don't look in packets. */