diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-10 19:05:30 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-10 19:05:30 +0000 |
| commit | f68020f1e160200583881aa79e312fe8a8b93e0d (patch) | |
| tree | 942b0b8329edb124932f2867cd2510722f27dc17 /epan/epan.c | |
| parent | dbca2e7d8fbb3abd8101911df8468701b71e2061 (diff) | |
| download | wireshark-f68020f1e160200583881aa79e312fe8a8b93e0d.tar.gz | |
Revert changes to ep_ allocator, revert edt ref-counting.
svn path=/trunk/; revision=45451
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/epan.c b/epan/epan.c index 3bb6eda095..64974774e3 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -164,8 +164,6 @@ epan_dissect_init(epan_dissect_t *edt, const gboolean create_proto_tree, const g edt->pi.dependent_frames = NULL; - edt->mem = ep_create_pool(); - return edt; } @@ -190,6 +188,9 @@ void epan_dissect_run(epan_dissect_t *edt, void* pseudo_header, const guint8* data, frame_data *fd, column_info *cinfo) { + /* free all memory allocated during previous packet */ + ep_free_all(); + dissect_packet(edt, pseudo_header, data, fd, cinfo); } @@ -209,8 +210,6 @@ epan_dissect_cleanup(epan_dissect_t* edt) if (edt->tree) { proto_tree_free(edt->tree); } - - ep_free_pool(edt->mem); } void |