diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-26 16:41:34 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-07-26 16:41:34 +0000 |
commit | 8f308fe1b180b41969539408e6642b6f99d28997 (patch) | |
tree | 182ce973464e711b2a161de5a871f9437ea6716c /epan/frame_data.c | |
parent | 3b36a234785b203745ea70d87d547d04a2693763 (diff) |
Revert r44049, frame_data_cleanup() is called when redissecting.
svn path=/trunk/; revision=44051
Diffstat (limited to 'epan/frame_data.c')
-rw-r--r-- | epan/frame_data.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index 7f5cbbe4f5..ee3a08e37f 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -308,8 +308,15 @@ frame_data_cleanup(frame_data *fdata) g_slist_free(fdata->pfd); fdata->pfd = NULL; } + + /* XXX, frame_data_cleanup() is called when redissecting (rescan_packets()), + * which might be triggered by lot of things, like: preferences change, setting manual address resolve, etc.. (grep by redissect_packets) + * fdata->opt_comment can be set by user, which we must not discard when redissecting. + */ +#if 0 if (fdata->opt_comment) { g_free(fdata->opt_comment); fdata->opt_comment = NULL; } +#endif } |