Revert r44049, frame_data_cleanup() is called when redissecting.

svn path=/trunk/; revision=44051

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
 }