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

Use g_hash_table_new_full() instead of g_hash_table_new() for subdissector 

registration tables, and use g_free as the value_destroy_func. This saves us
from manually freeing the value when we remove an item, and prevents us from
leaking memory when we accidentally overwrite an existing item.

svn path=/trunk/; revision=44814
This commit is contained in:
Evan Huus 2012-09-08 15:03:07 +00:00
parent f5428eddcd
commit d574361f5c
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/packet.c
View File

@ -822,11 +822,6 @@ dissector_delete_uint(const char *name, const guint32 pattern,
*/
g_hash_table_remove(sub_dissectors->hash_table,
GUINT_TO_POINTER(pattern));
/*
* Now free up the entry.
*/
g_free(dtbl_entry);
}
}
@ -893,7 +888,6 @@ dissector_reset_uint(const char *name, const guint32 pattern)
} else {
g_hash_table_remove(sub_dissectors->hash_table,
GUINT_TO_POINTER(pattern));
g_free(dtbl_entry);
}
}
@ -1086,11 +1080,6 @@ dissector_delete_string(const char *name, const gchar *pattern,
* Found - remove it.
*/
g_hash_table_remove(sub_dissectors->hash_table, pattern);
/*
* Now free up the entry.
*/
g_free(dtbl_entry);
}
}
@ -1157,7 +1146,6 @@ dissector_reset_string(const char *name, const gchar *pattern)
dtbl_entry->current = dtbl_entry->initial;
} else {
g_hash_table_remove(sub_dissectors->hash_table, pattern);
g_free(dtbl_entry);
}
}
@ -1568,14 +1556,18 @@ register_dissector_table(const char *name, const char *ui_name, const ftenum_t t
* XXX - there's no "g_uint_hash()" or "g_uint_equal()",
* so we use "g_direct_hash()" and "g_direct_equal()".
*/
sub_dissectors->hash_table = g_hash_table_new( g_direct_hash,
g_direct_equal );
sub_dissectors->hash_table = g_hash_table_new_full( g_direct_hash,
g_direct_equal,
NULL,
&g_free );
break;
case FT_STRING:
case FT_STRINGZ:
sub_dissectors->hash_table = g_hash_table_new( g_str_hash,
g_str_equal );
sub_dissectors->hash_table = g_hash_table_new_full( g_str_hash,
g_str_equal,
NULL,
&g_free );
break;
default: