Avoid annotation leaks by properly destroying NotePairs entries.

The leak was added with the "note" directive (r12414).

Also removed empty default constructor as unneeded.

diff --git a/src/Notes.cc b/src/Notes.cc
index 56d01c764603210cdc5a07e23a0c14f0924d5d05..1062f7fe993e3ab3531e3ebe4d35021e4cf0bbec 100644 (file)
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -132,6 +132,13 @@ Notes::clean()
     notes.clean();
 }
 
+
+NotePairs::~NotePairs()
+{
+    while (!entries.empty())
+        delete entries.pop_back();
+}
+
 const char *
 NotePairs::find(const char *noteKey) const
 {

diff --git a/src/Notes.h b/src/Notes.h
index daa576864b45482e1dd166c184082eb6cee1b9fb..108cdcc1f55f1e2f4e6c44a24a7fce27c3f66b3f 100644 (file)
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -122,7 +122,7 @@ public:
         MEMPROXY_CLASS(Entry);
     };
 
-    NotePairs() {}
+    ~NotePairs();
 
     /**
      * Append the entries of the src NotePairs list to our list.