Merge pull request #639 from spotify/erikbern/maybe-fix-memory-leak

Decref to object we got
spotify · Apr 10, 2023 · a07611b · a07611b
2 parents 0a338cd + daf2caa
commit a07611b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/annoymodule.cc b/src/annoymodule.cc
@@ -270,6 +270,8 @@ get_nns_to_python(const vector<int32_t>& result, const vector<float>& distances,
   if ((t = PyTuple_Pack(2, l, d)) == NULL) {
     goto error;
   }
+  Py_XDECREF(l);
+  Py_XDECREF(d);
 
   return t;
 

diff --git a/test/memory_leak_test.py b/test/memory_leak_test.py
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+import pytest
 import random
 
 from annoy import AnnoyIndex
@@ -48,3 +49,17 @@ def test_build_unbuid():
         i.build(10)
 
     assert i.get_n_items() == 1000
+
+
+def test_include_distances():
+    # See #633
+    # (Not able to repro it though)
+    f = 10
+    i = AnnoyIndex(f, "euclidean")
+    for j in range(10000):
+        i.add_item(j, [random.gauss(0, 1) for x in range(f)])
+    i.build(10)
+
+    v = [random.gauss(0, 1) for x in range(f)]
+    for _ in range(10000000):
+        indices, distances = i.get_nns_by_vector(v, 1, include_distances=True)