From: Sandro Santilli <strk@keybit.net>
Date: Fri, 5 Jul 2013 10:40:48 +0000 (+0000)
Subject: Fix the ST_MakeValid leak, keep it crash-free (#2307)
X-Git-Tag: 2.2.0rc1~1458
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a8ee75ffea02d05e9d492a1aa7005c7a8ef6fd0;p=postgis

Fix the ST_MakeValid leak, keep it crash-free (#2307)

git-svn-id: http://svn.osgeo.org/postgis/trunk@11636 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/liblwgeom/lwgeom_geos_clean.c b/liblwgeom/lwgeom_geos_clean.c
index 52a0c7e94..53dea0740 100644
--- a/liblwgeom/lwgeom_geos_clean.c
+++ b/liblwgeom/lwgeom_geos_clean.c
@@ -1053,8 +1053,7 @@ lwgeom_make_valid(LWGEOM* lwgeom_in)
 	{
 		LWDEBUG(3, "lwgeom_make_valid: forcing multi");
 		lwgeom_tmp = lwgeom_as_multi(lwgeom_out);
-		/* Don't free lwgeom_out, or you'll free memory underneath lwgeom_tmp */
-		/* lwgeom_free(lwgeom_out); */
+		lwfree(lwgeom_out); /* note: only frees the wrapper, not the content */
 		lwgeom_out = lwgeom_tmp;
 	}