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

Proto: Fixed proto_unregister_field() 

This function did not work after svn revision 51396.
This fix affects http, imf and ldap preferences.

Change-Id: I6fcb24c968d03c7d1fdc018cfa907f9cfd8809bb
Reviewed-on: https://code.wireshark.org/review/4881
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2014-10-20 22:44:25 +02:00
parent bc27265781
commit 0bbe48304a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/proto.c
View File

@ -5262,7 +5262,7 @@ proto_register_fields_manual(const int parent, header_field_info **hfi, const in
void
proto_unregister_field (const int parent, gint hf_id)
{
hf_register_info *hf;
header_field_info *hfi;
protocol_t *proto;
guint i;
@ -5275,10 +5275,10 @@ proto_unregister_field (const int parent, gint hf_id)
}
for (i = 0; i < proto->fields->len; i++) {
hf = (hf_register_info *)g_ptr_array_index(proto->fields, i);
if (*hf->p_id == hf_id) {
hfi = (header_field_info *)g_ptr_array_index(proto->fields, i);
if (hfi->id == hf_id) {
/* Found the hf_id in this protocol */
g_hash_table_steal(gpa_name_map, hf->hfinfo.abbrev);
g_hash_table_steal(gpa_name_map, hfi->abbrev);
g_ptr_array_remove_index_fast(proto->fields, i);
return;
}