Commitbd489c6

Nikita Glukhov

committed

Fix memleaks in json encoding using temporary memory context

1 parent5e87585 commitbd489c6Copy full SHA for bd489c6

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1599,15 +1599,27 @@ convertToJsonb(const JsonbValue *val, JsonValueEncoder encoder,`
`1599`	`1599`	`{`
`1600`	`1600`	`StringInfoDatabuffer;`
`1601`	`1601`	`void*res;`
	`1602`	`+MemoryContexttmpcxt,`
	`1603`	`+oldcxt;`
`1602`	`1604`
`1603`	`1605`	`/* Allocate an output buffer. It will be enlarged as needed */`
`1604`	`1606`	`initStringInfo(&buffer);`
`1605`	`1607`
`1606`	`1608`	`/* Make room for the varlena header */`
`1607`	`1609`	`reserveFromBuffer(&buffer,VARHDRSZ);`
`1608`	`1610`
	`1611`	`+tmpcxt=AllocSetContextCreate(CurrentMemoryContext,`
	`1612`	`+"Json Encoding Context",`
	`1613`	`+ALLOCSET_DEFAULT_MINSIZE,`
	`1614`	`+ALLOCSET_DEFAULT_INITSIZE,`
	`1615`	`+ALLOCSET_DEFAULT_MAXSIZE);`
	`1616`	`+oldcxt=MemoryContextSwitchTo(tmpcxt);`
	`1617`	`+`
`1609`	`1618`	`(*encoder)(&buffer,val,options);`
`1610`	`1619`
	`1620`	`+MemoryContextSwitchTo(oldcxt);`
	`1621`	`+MemoryContextDelete(tmpcxt);`
	`1622`	`+`
`1611`	`1623`	`/*`
`1612`	`1624`	`* Note: the JEntry of the root is discarded. Therefore the root`
`1613`	`1625`	`* JsonbContainer struct must contain enough information to tell what kind`

Comments

(0)