Fix memory leak when breaking mid-way in _get_objects and _get_ids (#266

) * Fix memory leak when breaking mid-way in _get_objects and _get_ids * Fix lint error
Toblerity · Jun 23, 2023 · cd5ac27 · cd5ac27
1 parent 9740c82
commit cd5ac27
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/rtree/index.py b/rtree/index.py
@@ -922,10 +922,8 @@ def _get_objects(self, it, num_results, objects):
                     else:
                         yield self.loads(data)
 
+        finally:
             core.rt.Index_DestroyObjResults(its, num_results)
-        except Exception:  # need to catch all exceptions, not just rtree.
-            core.rt.Index_DestroyObjResults(its, num_results)
-            raise
 
     def _get_ids(self, it, num_results):
         # take the pointer, yield the results  and free
@@ -935,10 +933,9 @@ def _get_ids(self, it, num_results):
         try:
             for i in range(num_results):
                 yield items.contents[i]
+
+        finally:
             core.rt.Index_Free(its)
-        except Exception:
-            core.rt.Index_Free(its)
-            raise
 
     def _nearest_obj(self, coordinates, num_results, objects):
         p_mins, p_maxs = self.get_coordinate_pointers(coordinates)