Merge pull request #2687 from dolthub/fulghum/bugfix

Bug fix for out of bounds slice access

Author: fulghum

server/functions/json.go

@@ -47,7 +47,10 @@ var json_in = framework.Function1{
 		if json.Valid(unsafe.Slice(unsafe.StringData(input), len(input))) {
 			return input, nil
 		}
-		return nil, pgtypes.ErrInvalidSyntaxForType.New("json", input[:10]+"...")
+		if len(input) > 10 {
+			input = input[:10] + "..."
+		}
+		return nil, pgtypes.ErrInvalidSyntaxForType.New("json", input)
 	},
 }
 

testing/PostgresDockerfile

@@ -13,7 +13,7 @@ RUN apt update -y && \
     curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
 RUN apt update -y && \
     apt install -y \
-    python3.8 \
+    python3 \
     python3-pip \
     python3-psycopg2 \
     curl \

testing/go/types_test.go

@@ -1218,6 +1218,14 @@ var typesTests = []ScriptTest{
 					{`"\ud83d\ude04\ud83d\udc36"`},
 				},
 			},
+			{
+				Query:       `SELECT '{'::json`,
+				ExpectedErr: "invalid input syntax for type json",
+			},
+			{
+				Query:       `SELECT '{"key": "value"'::json`,
+				ExpectedErr: "invalid input syntax for type json",
+			},
 		},
 	},
 	{