Changeset 12543

Timestamp:

10/26/07 14:43:47 (10 months ago)

Author:

mloskot

Message:

Fixed memory allocation error during SPATIAL INDEX creation for Shapefile (Ticket #1594).

Files:

• trunk/gdal/ogr/ogrsf_frmts/shape/shapefil.h (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/shape/shptree.c (modified) (1 diff)

trunk/gdal/ogr/ogrsf_frmts/shape/shapefil.h

@@ -312 +312 @@
-#define MAX_SUBNODE     4
-
+/* upper limit of tree levels for automatic estimation */
+#define MAX_DEFAULT_TREE_DEPTH 12
+
-typedef struct shape_tree_node
-{

trunk/gdal/ogr/ogrsf_frmts/shape/shptree.c

@@ -195 +195 @@
-            psTree->nMaxDepth += 1;
-            nMaxNodeCount = nMaxNodeCount * 2;
+        }
+
+        /* NOTE: Due to problems with memory allocation for deep trees,
+         * automatically estimated depth is limited up to 12 levels.
+         * See Ticket #1594 for detailed discussion.
+         */
+        if( psTree->nMaxDepth > MAX_DEFAULT_TREE_DEPTH )
+        {
+            psTree->nMaxDepth = MAX_DEFAULT_TREE_DEPTH;
+
+#ifdef USE_CPL
+        CPLDebug( "Shape",
+                  "Falling back to max number of allowed index tree levels (%d).",
+                  MAX_DEFAULT_TREE_DEPTH );
+#endif
-        }
-    }