[QGIS Commit] r10913 - branches/symbology-ng-branch/src/core/pal

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-06-12 14:14:22 -0400 (Fri, 12 Jun 2009)
New Revision: 10913

Modified:
   branches/symbology-ng-branch/src/core/pal/layer.cpp
Log:
Fixed bad_alloc exception followed by a deadlock when working with invalid geometry.


Modified: branches/symbology-ng-branch/src/core/pal/layer.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/pal/layer.cpp	2009-06-12 16:03:17 UTC (rev 10912)
+++ branches/symbology-ng-branch/src/core/pal/layer.cpp	2009-06-12 18:14:22 UTC (rev 10913)
@@ -347,6 +347,11 @@
           //case geos::geom::GEOS_POINT:
           //case geos::geom::GEOS_LINESTRING:
           //case geos::geom::GEOS_POLYGON:
+
+          // ignore invalid geometries
+          if ( (f->type == GEOS_LINESTRING && f->nbPoints < 2) ||
+               (f->type == GEOS_POLYGON && f->nbPoints < 3) )
+            continue;
 #ifdef _DEBUG_FULL_
           std::cout << "Create Feat" << std::endl;
 #endif