Merge pull request cockroachdb#71307 from cockroachdb/blathers/backpo…

…rt-release-20.2-71110 release-20.2: geo: fix invalid GeoJSON output
postamar · Oct 25, 2021 · 0b4fd4e · 0b4fd4e
2 parents 7394fc5 + f970f50
commit 0b4fd4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/geo/parse.go b/pkg/geo/parse.go
@@ -115,6 +115,9 @@ func parseGeoJSON(
 	if err := geojson.Unmarshal(b, &t); err != nil {
 		return geopb.SpatialObject{}, err
 	}
+	if t == nil {
+		return geopb.SpatialObject{}, errors.Newf("invalid GeoJSON input")
+	}
 	if defaultSRID != 0 && t.SRID() == 0 {
 		AdjustGeomTSRID(t, defaultSRID)
 	}

diff --git a/pkg/sql/logictest/testdata/logic_test/geospatial b/pkg/sql/logictest/testdata/logic_test/geospatial
@@ -372,6 +372,12 @@ SELECT
 ----
 true  true
 
+statement error invalid GeoJSON input
+select st_geomfromgeojson(json_typeof('null'))
+
+statement error invalid GeoJSON input
+select st_geogfromgeojson(json_typeof('null'))
+
 query TTTTTTT
 SELECT
   ST_AsText(geom),