summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-dcerpc-ndr.c
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2012-04-28 18:23:19 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2012-04-28 18:23:19 +0000
commit79b57614c575857b0de875536dfc22616518846e (patch)
tree239032301798d1e762259635babc45705b5b665b /epan/dissectors/packet-dcerpc-ndr.c
parentc47744e353ee479e10feae014d91778524c77294 (diff)
downloadwireshark-79b57614c575857b0de875536dfc22616518846e.tar.gz
Initialize val to 0 in case pdata != NULL but "di->conformant_run" is TRUE so the *pdata won't contain garbage as reported by clang.
svn path=/trunk/; revision=42324
Diffstat (limited to 'epan/dissectors/packet-dcerpc-ndr.c')
-rw-r--r--epan/dissectors/packet-dcerpc-ndr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc-ndr.c b/epan/dissectors/packet-dcerpc-ndr.c
index 44867f08a5..e82d251094 100644
--- a/epan/dissectors/packet-dcerpc-ndr.c
+++ b/epan/dissectors/packet-dcerpc-ndr.c
@@ -228,7 +228,7 @@ dissect_ndr_uint3264 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
if (di->call_data->flags & DCERPC_IS_NDR64) {
return dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hfindex, pdata);
} else {
- guint32 val;
+ guint32 val = 0;
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, &val);
if (pdata) {
*pdata = val;
@@ -252,7 +252,7 @@ dissect_ndr_uint1632 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
if (di->call_data->flags & DCERPC_IS_NDR64) {
return dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, pdata);
} else {
- guint16 val;
+ guint16 val = 0;
offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hfindex, &val);
if (pdata) {
*pdata = val;