From d6d44cca4b3477d42775c157fd1ab265979a78f7 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 29 Aug 2005 22:36:14 +0000 Subject: [PATCH] Removed premature object destruction in InsertLineString{WKT,} causing segfault git-svn-id: http://svn.osgeo.org/postgis/branches/pgis_1_0@1878 b70326c6-7e19-0410-871a-916f4a2858ee --- CHANGES | 3 ++- loader/shp2pgsql.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 551e86137..5349c13ea 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,8 @@ PostGIS 1.0.4 - Segfault fix in transform() handling of proj4 errors - Fixed some proj4 texts in spatial_ref_sys (missing +proj) - GiST indexing cleanup - - Loader: fixed string functions usage, reworked NULL objects check + - Loader: fixed string functions usage, reworked NULL objects check, + fixed segfault on MULTILINESTRING input. PostGIS 1.0.3 2005/08/08 diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c index b3fdf038b..af30f75ea 100644 --- a/loader/shp2pgsql.c +++ b/loader/shp2pgsql.c @@ -766,7 +766,6 @@ InsertLineString(int id) if (dump_format) printf("\\N\n"); else printf("NULL);\n"); - SHPDestroyObject(obj); return; } @@ -821,7 +820,6 @@ InsertLineStringWKT(int id) if (dump_format) printf("\\N\n"); else printf("NULL);\n"); - SHPDestroyObject(obj); return; } @@ -1662,6 +1660,9 @@ utf8 (const char *fromcode, char *inputbuf) /********************************************************************** * $Log$ + * Revision 1.88.2.7 2005/08/29 22:36:14 strk + * Removed premature object destruction in InsertLineString{WKT,} causing segfault + * * Revision 1.88.2.6 2005/08/29 11:48:42 strk * Fixed sprintf() calls to avoid overlapping memory, * reworked not-null objects existance check to reduce startup costs. -- 2.40.0