NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit3c000fd

committed

Fix two small bugs in json's populate_record_worker

The first bug is not releasing a tupdesc when doing an early return outof the function. The second bug is a logic error in choosing when to doan early return if given an empty jsonb object.Bug reports from Pavel Stehule and Tom Lane respectively.Backpatch to 9.4 where these were introduced.

1 parentc90b85e commit3c000fdCopy full SHA for 3c000fd

File tree

1 file changed

-1

lines changed

src/backend/utils/adt
- jsonfuncs.c

1 file changed

-1

lines changed

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

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2115,6 +2115,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,`
`2115`	`2115`	`if (hash_get_num_entries(json_hash)==0&&rec)`
`2116`	`2116`	`{`
`2117`	`2117`	`hash_destroy(json_hash);`
	`2118`	`+ReleaseTupleDesc(tupdesc);`
`2118`	`2119`	`PG_RETURN_POINTER(rec);`
`2119`	`2120`	`}`
`2120`	`2121`	`}`
`@@ -2123,8 +2124,11 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,`
`2123`	`2124`	`jb=PG_GETARG_JSONB(json_arg_num);`
`2124`	`2125`
`2125`	`2126`	`/* same logic as for json */`
`2126`		`-if (!have_record_arg&&rec)`
	`2127`	`+if (JB_ROOT_COUNT(jb)==0&&rec)`
	`2128`	`+{`
	`2129`	`+ReleaseTupleDesc(tupdesc);`
`2127`	`2130`	`PG_RETURN_POINTER(rec);`
	`2131`	`+}`
`2128`	`2132`	`}`
`2129`	`2133`
`2130`	`2134`	`ncolumns=tupdesc->natts;`

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!

Commit3c000fd

File tree

1 file changed

1 file changed

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

0 commit comments