Qt: Plug memory leak in ByteViewText.

Each time we create a ByteViewText, which is twice when a packet is selected, the menu items leaks. Ensure we clear the items when done. Change-Id: Idf0c7b82bf241120dd4c42ba85c56c0a2bf8db46 Reviewed-on: https://code.wireshark.org/review/12826 Petri-Dish: Stig Bjørlykke <[email protected]> Tested-by: Petri Dish Buildbot <[email protected]> Reviewed-by: Stig Bjørlykke <[email protected]>
pstavirs · Dec 22, 2015 · 2997178 · 2997178
1 parent 3bd69da
commit 2997178
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp
@@ -86,6 +86,11 @@ ByteViewText::ByteViewText(QWidget *parent, tvbuff_t *tvb, proto_tree *tree, QTr
     setMouseTracking(true);
 }
 
+ByteViewText::~ByteViewText()
+{
+    ctx_menu_.clear();
+}
+
 void ByteViewText::setEncoding(packet_char_enc encoding)
 {
     encoding_ = encoding;

diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h
@@ -43,6 +43,8 @@ class ByteViewText : public QAbstractScrollArea
     Q_OBJECT
 public:
     explicit ByteViewText(QWidget *parent = 0, tvbuff_t *tvb = NULL, proto_tree *tree = NULL, QTreeWidget *protoTree = NULL, packet_char_enc encoding = PACKET_CHAR_ENC_CHAR_ASCII);
+    ~ByteViewText();
+
     bool hasDataSource(const tvbuff_t *ds_tvb = NULL);
     void setEncoding(packet_char_enc encoding);
     void setFormat(bytes_view_type format);