osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bugs: #7532, 7534 dissect_ndr_cvstring returns ep-memory, don't free it. 

(Likely to occur cause r44053)

svn path=/trunk/; revision=44063
This commit is contained in:
Jakub Zawadzki 2012-07-27 08:39:05 +00:00
parent ad7c4a4bba
commit 9b03c418cc
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-dcerpc-spoolss.c
View File

@ -1033,8 +1033,6 @@ SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
tvb, offset, pinfo, tree, drep, sizeof(guint16),
hf_printerdata_key, TRUE, &key_name);
CLEANUP_PUSH(g_free, key_name);
offset = dissect_ndr_cvstring(
tvb, offset, pinfo, tree, drep, sizeof(guint16),
hf_printerdata_value, TRUE, &value_name);
@ -1043,9 +1041,6 @@ SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s/%s",
key_name, value_name);
CLEANUP_CALL_AND_POP;
g_free(value_name);
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_printerdata_type, NULL);
@ -4349,8 +4344,6 @@ SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (check_col(pinfo->cinfo, COL_INFO) && name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", name);
g_free(name);
return offset;
}
@ -4401,8 +4394,6 @@ SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (check_col(pinfo->cinfo, COL_INFO) && name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", name);
g_free(name);
offset = dissect_ndr_uint32(
tvb, offset, pinfo, tree, drep, hf_form_level, &level);
@ -5369,8 +5360,6 @@ SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset,
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", value_name);
g_free(value_name);
return offset;
}
@ -6688,8 +6677,6 @@ SpoolssEnumPrinterKey_q(tvbuff_t *tvb, int offset,
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", kn);
}
g_free(key_name);
offset = dissect_ndr_uint32(
tvb, offset, pinfo, tree, drep, hf_needed, NULL);
@ -6746,8 +6733,6 @@ SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset,
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", key_name);
g_free(key_name);
offset = dissect_ndr_uint32(
tvb, offset, pinfo, tree, drep, hf_offered, NULL);

1
epan/dissectors/packet-dcerpc.c
View File

@ -1694,7 +1694,6 @@ PIDL_dissect_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
g_free(s);
return offset;
}