diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-01 18:16:55 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-01 18:16:55 +0000 |
| commit | 17f010119acebd1ae599d44b3456bbb7b1c63ab2 (patch) | |
| tree | f5f8a91956fb8ac09d9b4958ffa2f12729495caf /epan/dfilter/dfilter.c | |
| parent | 95bf5607278eb0a10a12f5d69af2bf27c5fd56a3 (diff) | |
| download | wireshark-17f010119acebd1ae599d44b3456bbb7b1c63ab2.tar.gz | |
From Jakub Zawadzki via. Bug 3330:
* Fix memleak (df->deprecated in dfilter_free())
* Free protocol hash tables on cleanup.
* Free protocols list on cleanup.
* Free memory allocated by fgetline() in parse_services_file()
From me:
* proto.c: set gmc_hfinfo to NULL after free
* proto.c: switch order of g_free() and g_list_remove() in proto_cleanup()
svn path=/trunk/; revision=29656
Diffstat (limited to 'epan/dfilter/dfilter.c')
| -rw-r--r-- | epan/dfilter/dfilter.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 2ca09112b3..dde317b435 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -159,6 +159,16 @@ dfilter_free(dfilter_t *df) } } + if (df->deprecated) { + guint i; + + for (i = 0; i < df->deprecated->len; ++i) { + gchar *depr = g_ptr_array_index(df->deprecated, i); + g_free(depr); + } + g_ptr_array_free(df->deprecated, TRUE); + } + g_free(df->registers); g_free(df->attempted_load); g_free(df); |