Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.6.x] Fixed #21662 -- Kept parent reference in prepared geometry

Thanks Robert Scott for the report.
Backport of 542198c from master.
  • Loading branch information...
commit b536ad09cadc087b7559db2f8cca50f06c6e8f34 1 parent 847d2ab
@claudep claudep authored
View
7 django/contrib/gis/geos/prepared.py
@@ -11,7 +11,12 @@ class PreparedGeometry(GEOSBase):
ptr_type = capi.PREPGEOM_PTR
def __init__(self, geom):
- if not isinstance(geom, GEOSGeometry): raise TypeError
+ # Keeping a reference to the original geometry object to prevent it
+ # from being garbage collected which could then crash the prepared one
+ # See #21662
+ self._base_geom = geom
+ if not isinstance(geom, GEOSGeometry):
+ raise TypeError
self.ptr = capi.geos_prepare(geom.ptr)
def __del__(self):
View
4 django/contrib/gis/geos/tests/test_geos.py
@@ -1043,6 +1043,10 @@ def test_prepared(self):
self.assertEqual(mpoly.intersects(pnt), prep.intersects(pnt))
self.assertEqual(c, prep.covers(pnt))
+ # Original geometry deletion should not crash the prepared one (#21662)
+ del mpoly
+ self.assertTrue(prep.covers(Point(5, 5)))
+
def test_line_merge(self):
"Testing line merge support"
ref_geoms = (fromstr('LINESTRING(1 1, 1 1, 3 3)'),
View
3  docs/releases/1.6.2.txt
@@ -9,4 +9,5 @@ This is Django 1.6.2, a bugfix release for Django 1.6.
Bug fixes
=========
-...
+* Prevented the base geometry object of a prepared geometry to be garbage
+ collected, which could lead to crash Django (#21662).
Please sign in to comment.
Something went wrong with that request. Please try again.