Merge branch 'master' of https://github.com/mapserver/tinyows

Author: Ubuntu

src/mapfile/mapfile.c

@@ -1672,8 +1672,10 @@ static void end_layer()
  * down here because we want the user's section 1 to have been scanned first.
  * The user has a chance to override it with an option.
  */
+#ifndef _WIN32
 #include <unistd.h>
 #endif
+#endif
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *

src/ows/ows_geobbox.c

@@ -58,8 +58,8 @@ ows_geobbox *ows_geobbox_copy(ows_geobbox *g)
   ows_geobbox *c;
 
   assert(g);
-  c = malloc(sizeof(g));
-  return memcpy(c, g, sizeof(g));
+  c = malloc(sizeof(*g));
+  return memcpy(c, g, sizeof(*g));
 }
 
 

src/struct/buffer.c

@@ -141,7 +141,11 @@ buffer *buffer_ftoa(double f)
 
   res = buffer_init();
   while (res->size < 100) buffer_realloc(res);
+  #ifndef _WIN32
   snprintf(res->buf, 99, "%f", f);
+  #else
+  _snprintf(res->buf, 99, "%f", f);
+  #endif 
   res->use = strlen(res->buf);
 
   return res;

src/wfs/wfs_transaction.c

@@ -505,7 +505,7 @@ static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNo
     node = n->children;
 
     /* Jump to the next element if spaces */
-    while (node->type != XML_ELEMENT_NODE) node = node->next;
+    while (node != NULL && node->type != XML_ELEMENT_NODE) node = node->next;
 
     /* Fill SQL fields and values at once */
     for ( /* empty */ ; node; node = node->next) {
@@ -541,45 +541,48 @@ static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNo
           elemt = node->children;
 
           /* Jump to the next element if spaces */
-          while (elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
-
-          if (!strcmp((char *) elemt->name, "Box") ||
-              !strcmp((char *) elemt->name, "Envelope")) {
-
-            fe = filter_encoding_init();
-            fe->sql = fe_envelope(o, layer_name, fe, fe->sql, elemt);
-            if (fe->error_code != FE_NO_ERROR) {
-              result = fill_fe_error(o, fe);
-              buffer_free(sql);
-              buffer_free(values);
-              buffer_free(column);
-              buffer_free(id);
+          while (elemt != NULL && elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
+          if (elemt != NULL) {
+            if (!strcmp((char *) elemt->name, "Box") ||
+                !strcmp((char *) elemt->name, "Envelope")) {
+
+              fe = filter_encoding_init();
+              fe->sql = fe_envelope(o, layer_name, fe, fe->sql, elemt);
+              if (fe->error_code != FE_NO_ERROR) {
+                result = fill_fe_error(o, fe);
+                buffer_free(sql);
+                buffer_free(values);
+                buffer_free(column);
+                buffer_free(id);
+                filter_encoding_free(fe);
+                return result;
+              }
+              buffer_copy(values, fe->sql);
               filter_encoding_free(fe);
-              return result;
-            }
-            buffer_copy(values, fe->sql);
-            filter_encoding_free(fe);
-
-          } else if (!strcmp((char *) elemt->name, "Null")) {
-            buffer_add_str(values, "''");
-          } else {
-            gml = ows_psql_gml_to_sql(o, elemt, srid_root);
-            if (gml) {
-              buffer_add_str(values, "'");
-              buffer_copy(values, gml);
-              buffer_add_str(values, "'");
-              buffer_free(gml);
+
+            } else if (!strcmp((char *) elemt->name, "Null")) {
+              buffer_add_str(values, "''");
             } else {
-              buffer_free(sql);
-              buffer_free(values);
-              buffer_free(column);
-              buffer_free(id);
-              buffer_free(layer_name);
-
-              result = buffer_from_str("Error invalid Geometry");
-              return result;
+              gml = ows_psql_gml_to_sql(o, elemt, srid_root);
+              if (gml) {
+                buffer_add_str(values, "'");
+                buffer_copy(values, gml);
+                buffer_add_str(values, "'");
+                buffer_free(gml);
+              } else {
+                buffer_free(sql);
+                buffer_free(values);
+                buffer_free(column);
+                buffer_free(id);
+                buffer_free(layer_name);
+
+                result = buffer_from_str("Error invalid Geometry");
+                return result;
+              }
             }
           }
+          else
+            buffer_add_str(values, "NULL");
 
         } else values = wfs_retrieve_value(o, wr, values, xmldoc, node);