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/addr_resolv.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/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index e1ea4c13c9..55363ec0a6 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -505,8 +505,8 @@ add_serv_port_cb(guint32 port) static void parse_services_file(const char * path) { FILE *serv_p; - static int size = 0; - static char *buf = NULL; + char *buf = NULL; + int size = 0; /* services hash table initialization */ serv_p = ws_fopen(path, "r"); @@ -517,7 +517,7 @@ static void parse_services_file(const char * path) while (fgetline(&buf, &size, serv_p) >= 0) { parse_service_line (buf); } - + g_free(buf); fclose(serv_p); } |