Merge pull request #615 from peterstace/issue_397_check_geometry_coll…

…ection_coord_types_for_wkb

Add dimension check when parsing WKB GeometryCollections

CHANGELOG.md

@@ -5,7 +5,7 @@
 - Upgrades `golangci-lint` to `v1.58.1`.
 
 - Fixes a bug where geometry collections with mixed coordinate types were
-  erroneously allowed during WKT parsing.
+  erroneously allowed during WKT and WKB parsing.
 
 ## v0.50.0
 

geom/wkb_parser.go

@@ -364,6 +364,13 @@ func (p *wkbParser) parseGeometryCollection(ctype CoordinatesType) (GeometryColl
 		if err != nil {
 			return GeometryCollection{}, err
 		}
+		if geoms[i].CoordinatesType() != ctype {
+			err := mismatchedGeometryCollectionDimsError{
+				ctype,
+				geoms[i].CoordinatesType(),
+			}
+			return GeometryCollection{}, err
+		}
 	}
 	return NewGeometryCollection(geoms), nil
 }

geom/wkb_test.go

@@ -3,6 +3,7 @@ package geom_test
 import (
 	"bytes"
 	"encoding/hex"
+	"fmt"
 	"strconv"
 	"strings"
 	"testing"
@@ -678,3 +679,46 @@ func TestWKBUnmarshalEndianess(t *testing.T) {
 		})
 	}
 }
+
+func TestWKBGeometryCollectionMixedCoordinateTypes(t *testing.T) {
+	const (
+		bigEndian = "00"
+		f64Zero   = "0000000000000000"
+		u32One    = "00000001"
+	)
+
+	for _, gc := range []struct {
+		hex string
+		ct  geom.CoordinatesType
+	}{
+		{"00000007", geom.DimXY},
+		{"000003ef", geom.DimXYZ},
+		{"000007d7", geom.DimXYM},
+		{"00000bbf", geom.DimXYZM},
+	} {
+		for _, point := range []struct {
+			hex string
+			ct  geom.CoordinatesType
+		}{
+			{"00000001", geom.DimXY},
+			{"000003e9", geom.DimXYZ},
+			{"000007d1", geom.DimXYM},
+			{"00000bb9", geom.DimXYZM},
+		} {
+			t.Run(fmt.Sprintf("gc_%v_point_%v", gc.ct, point.ct), func(t *testing.T) {
+				hex := bigEndian +
+					gc.hex +
+					u32One +
+					bigEndian +
+					point.hex +
+					strings.Repeat(f64Zero, point.ct.Dimension())
+				_, err := geom.UnmarshalWKB(hexStringToBytes(t, hex))
+				if gc.ct == point.ct {
+					expectNoErr(t, err)
+				} else {
+					expectErr(t, err)
+				}
+			})
+		}
+	}
+}