diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-12-24 15:19:25 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-12-26 11:14:25 +0100 |
| commit | b536ad09cadc087b7559db2f8cca50f06c6e8f34 (patch) | |
| tree | f5a9fb9c02837df81cd161dd71daba948dc3e53d | |
| parent | 847d2ab5b3b786f735267f77dd02ba52451a1e7f (diff) | |
[1.6.x] Fixed #21662 -- Kept parent reference in prepared geometry
Thanks Robert Scott for the report.
Backport of 542198c1d0 from master.
| -rw-r--r-- | django/contrib/gis/geos/prepared.py | 7 | ||||
| -rw-r--r-- | django/contrib/gis/geos/tests/test_geos.py | 4 | ||||
| -rw-r--r-- | docs/releases/1.6.2.txt | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/django/contrib/gis/geos/prepared.py b/django/contrib/gis/geos/prepared.py index 68b812df8a..ae2548ff98 100644 --- a/django/contrib/gis/geos/prepared.py +++ b/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): diff --git a/django/contrib/gis/geos/tests/test_geos.py b/django/contrib/gis/geos/tests/test_geos.py index c7fe5b2321..c8e064bb95 100644 --- a/django/contrib/gis/geos/tests/test_geos.py +++ b/django/contrib/gis/geos/tests/test_geos.py @@ -1043,6 +1043,10 @@ class GEOSTest(unittest.TestCase, TestDataMixin): 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)'), diff --git a/docs/releases/1.6.2.txt b/docs/releases/1.6.2.txt index cae18b86fa..fa8bd5bc93 100644 --- a/docs/releases/1.6.2.txt +++ b/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). |