Changeset 11226

Timestamp:

04/08/07 10:54:41 (2 years ago)

Author:

mloskot

Message:

Fixed detecting 4-dim coords in EWKB stream as unsupported variant and return NULL geometry (Ticket #1323). Submitted to the trunk in r11041.

Files:

• branches/1.4/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp (modified) (4 diffs)

branches/1.4/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp

@@ -32 +32 @@
-#include "ogr_pg.h"
-#include "ogrpgutility.h"
+#include "ogr_p.h"
-#include "cpl_conv.h"
-#include "cpl_string.h"
@@ -267 +268 @@
-            GByte * pabyWkb = (GByte *)PQgetvalue( hCursorResult,
-                                                   iRecord, iField);
+
+
+
-            OGRGeometry * poGeom = NULL;
-            OGRGeometryFactory::createFromWkb(pabyWkb,NULL,&poGeom);
@@ -625 +629 @@
-
-{
-
-
-
+
+
+
+
+
-
-    if( pszBytea == NULL )
@@ -665 +671 @@
-
-/* -------------------------------------------------------------------- */
+/*      Detect XYZM variant of PostGIS EWKB                             */
+/*                                                                      */
+/*      OGR does not support parsing M coordinate,                      */
+/*      so we return NULL geometry.                                     */
+/* -------------------------------------------------------------------- */
+    memcpy(&ewkbFlags, pabyWKB+1, 4);
+    OGRwkbByteOrder eByteOrder = (pabyWKB[0] == 0 ? wkbXDR : wkbNDR);
+    if( OGR_SWAP( eByteOrder ) )
+        ewkbFlags= CPL_SWAP32(ewkbFlags);
+
+    if (ewkbFlags & 0x40000000)
+    {
+        CPLError( CE_Failure, CPLE_AppDefined,
+            "Reading EWKB with 4-dimensional coordinates (XYZM) is not supported" );
+
+        CPLFree( pabyWKB );
+        return NULL;
+    }
+
+/* -------------------------------------------------------------------- */
-/*      PostGIS EWKB format includes an  SRID, but this won't be        */
-/*      understood by OGR, so if the SRID flag is set, we remove the    */