NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit9111d46

committed

Remove ill-conceived ban on zero length json object keys.

We removed a similar ban on this in json_object recently, but the ban indatum_to_json was left, which generate4d sprutious errors in othee jsongenerators, notable json_build_object.Along the way, add an assertion that datum_to_json is not passed a nullkey. All current callers comply with this rule, but the assertion willcatch any possible future misbehaviour.

1 parent5d7962c commit9111d46Copy full SHA for 9111d46

File tree

1 file changed

-4

lines changed

src/backend/utils/adt
- json.c

1 file changed

-4

lines changed

`‎src/backend/utils/adt/json.c`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1342,6 +1342,9 @@ datum_to_json(Datum val, bool is_null, StringInfo result,`
`1342`	`1342`	`boolnumeric_error;`
`1343`	`1343`	`JsonLexContextdummy_lex;`
`1344`	`1344`
	`1345`	`+/* callers are expected to ensure that null keys are not passed in */`
	`1346`	`+Assert( ! (key_scalar&&is_null));`
	`1347`	`+`
`1345`	`1348`	`if (is_null)`
`1346`	`1349`	`{`
`1347`	`1350`	`appendStringInfoString(result,"null");`
`@@ -1487,10 +1490,6 @@ datum_to_json(Datum val, bool is_null, StringInfo result,`
`1487`	`1490`	`break;`
`1488`	`1491`	`default:`
`1489`	`1492`	`outputstr=OidOutputFunctionCall(outfuncoid,val);`
`1490`		`-if (key_scalar&&*outputstr=='\0')`
`1491`		`-ereport(ERROR,`
`1492`		`-(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`1493`		`-errmsg("key value must not be empty")));`
`1494`	`1493`	`escape_json(result,outputstr);`
`1495`	`1494`	`pfree(outputstr);`
`1496`	`1495`	`break;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9111d46

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/json.c`

0 commit comments