fix panic when calling ST_POINTFROMWKB() with no arguments (#2121)

dolthub · Nov 5, 2023 · 422c3fe · 422c3fe
1 parent 857710f
commit 422c3fe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/sql/expression/function/spatial/wkb.go b/sql/expression/function/spatial/wkb.go
@@ -266,7 +266,7 @@ var _ sql.CollationCoercible = (*PointFromWKB)(nil)
 
 // NewPointFromWKB creates a new point expression.
 func NewPointFromWKB(args ...sql.Expression) (sql.Expression, error) {
-	if len(args) < 1 && len(args) > 3 {
+	if len(args) < 1 || len(args) > 3 {
 		return nil, sql.ErrInvalidArgumentNumber.New("ST_POINTFROMWKB", "1, 2, or 3", len(args))
 	}
 	return &PointFromWKB{expression.NaryExpression{ChildExpressions: args}}, nil

diff --git a/sql/expression/function/spatial/wkb_test.go b/sql/expression/function/spatial/wkb_test.go
@@ -592,4 +592,24 @@ func TestGeomFromWKB(t *testing.T) {
 		require.NoError(err)
 		require.Equal(nil, v)
 	})
+
+	t.Run("empty args errors", func(t *testing.T) {
+		require := require.New(t)
+		_, err := NewPointFromWKB()
+		require.Error(err)
+		_, err = NewLineFromWKB()
+		require.Error(err)
+		_, err = NewPolyFromWKB()
+		require.Error(err)
+		_, err = NewMultiPoint()
+		require.Error(err)
+		_, err = NewMultiLineString()
+		require.Error(err)
+		_, err = NewMultiPolygon()
+		require.Error(err)
+		_, err = NewGeomFromWKB()
+		require.Error(err)
+		_, err = NewGeomCollFromWKB()
+		require.Error(err)
+	})
 }