Merge branch 'branch-6-2'

MapServer · Jul 3, 2012 · bd4cf18 · bd4cf18
2 parents 10b68d8 + ca7243a
commit bd4cf18
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mapshape.c b/mapshape.c
@@ -1865,7 +1865,8 @@ int msTiledSHPOpenFile(layerObj *layer)
     free(tSHP);
     return MS_FAILURE;
   }
-
+
+  tSHP->shpfile->isopen = MS_FALSE; /* in case of error: do not try to close the shpfile */
   tSHP->tileshpfile = NULL; /* may need this if not using a tile layer, look for malloc later */
   layer->layerinfo = tSHP;
 
@@ -1899,6 +1900,7 @@ int msTiledSHPOpenFile(layerObj *layer)
                  __FILE__, __LINE__, sizeof(shapefileObj));
       free(tSHP->shpfile);
       free(tSHP);
+      layer->layerinfo = NULL;
       return MS_FAILURE;
     }