WFS: fix segfault when issuing GetFeature on a layer that can't be op…

…ened
MapServer · Nov 6, 2013 · dc7f35c · dc7f35c
1 parent 6a5935d
commit dc7f35c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/mapwfs.c b/mapwfs.c
@@ -3188,9 +3188,8 @@ int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req,
 
               msFreeCharArray(tokens, n);
               msLayerClose(lp);
-            }
 
-            if (strlen(papszPropertyName[k]) > 0) {
+              if (strlen(papszPropertyName[k]) > 0) {
 
                 if (strcasecmp(papszPropertyName[k], "*") == 0) {
                   /* Add all non-excluded items, including optional ones */
@@ -3272,8 +3271,17 @@ int msWFSGetFeature(mapObj *map, wfsParamsObj *paramsObj, cgiRequestObj *req,
                     msInsertHashTable(&(lp->metadata), "GML_GEOMETRIES", "none");
                   }
                 }
-            } else {/*empty string*/
+              } else {/*empty string*/
                 msInsertHashTable(&(lp->metadata), "GML_GEOMETRIES", "none");
+              }
+            }
+            else
+            {
+                msFree(pszPropertyName);
+                if( papszPropertyName )
+                    msFreeCharArray(papszPropertyName, numlayers);
+                msFreeCharArray(layers, numlayers);
+                return msWFSException(map, "mapserv", "NoApplicableCode", paramsObj->pszVersion);
             }
 
             msGMLFreeItems(itemList);