diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-03 21:38:59 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-03 21:38:59 +0000 |
| commit | db645599723c5762384f15dde339226c009db2fb (patch) | |
| tree | 2b814abac34b3b5c7658d5ff9c5be6d285c9e649 /epan | |
| parent | 189478691676e98c4e856856678140fcbe001737 (diff) | |
From Martin Kaiser (on -dev): initialize an uninitialized variable. From me: also clean up some indentation.
svn path=/trunk/; revision=41912
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 5b8419565d..687d4b1b21 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -494,7 +494,7 @@ dissect_spoolss_string_parm_data(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_info *di = pinfo->private_data; guint32 buffer_len, len; gchar *s; - proto_item *item; + proto_item *item = NULL; if (di->conformant_run) return offset; @@ -506,8 +506,8 @@ dissect_spoolss_string_parm_data(tvbuff_t *tvb, int offset, packet_info *pinfo, s = tvb_get_ephemeral_unicode_stringz(tvb, offset, &len, ENC_LITTLE_ENDIAN); - if (tree && buffer_len) { - tvb_ensure_bytes_exist(tvb, offset, buffer_len); + if (tree && buffer_len) { + tvb_ensure_bytes_exist(tvb, offset, buffer_len); item = proto_tree_add_string( tree, hf_string_parm_data, tvb, offset, len, s); @@ -516,7 +516,7 @@ dissect_spoolss_string_parm_data(tvbuff_t *tvb, int offset, packet_info *pinfo, if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); - + /* Append string to upper level item */ if (tree && item) { item = item->parent != NULL ? item->parent : item; |