diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-20 02:29:13 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-10-20 02:29:13 +0000 |
| commit | ab7ec88be559a78e696ab98d8a692bbf64746fbd (patch) | |
| tree | 3dda94e29ab84115d30f53221b053afd7a4b4873 /epan/packet.c | |
| parent | db8bf387c898e97ff95a08fb990b3280b310d7a7 (diff) | |
Delay freeing of seasonal memory until after the conversation cleanup routine
has been called.
In the conversation cleanup routine, free the GSlist for any proto_data which
may have been hanging off the (se_allocated) conversation.
svn path=/trunk/; revision=39484
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/packet.c b/epan/packet.c index 423665c361..b569ff1ec7 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -149,12 +149,14 @@ init_dissection(void) void cleanup_dissection(void) { + /* Cleanup the table of conversations. Do this before freeing seasonal + * memory (at least until conversation's use of g_slist is changed). + */ + epan_conversation_cleanup(); + /* Reclaim all memory of seasonal scope */ se_free_all(); - /* Cleanup the table of conversations. */ - epan_conversation_cleanup(); - /* Cleanup the table of circuits. */ epan_circuit_cleanup(); |