Fix memleaks in json encoding using temporary memory context

Nikita Glukhov · Nikita Glukhov · commit 7237e0996bb7 · 2020-11-24T18:49:55.000+03:00
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -1672,15 +1672,27 @@ convertToJsonb(const JsonbValue *val, JsonValueEncoder encoder)
 {
 	StringInfoData	buffer;
 	void		   *res;
+	MemoryContext	tmpcxt,
+					oldcxt;
 
 	/* Allocate an output buffer. It will be enlarged as needed */
 	initStringInfo(&buffer);
 
 	/* Make room for the varlena header */
 	reserveFromBuffer(&buffer, VARHDRSZ);
 
+	tmpcxt = AllocSetContextCreate(CurrentMemoryContext,
+								   "Json Encoding Context",
+								   ALLOCSET_DEFAULT_MINSIZE,
+								   ALLOCSET_DEFAULT_INITSIZE,
+								   ALLOCSET_DEFAULT_MAXSIZE);
+	oldcxt = MemoryContextSwitchTo(tmpcxt);
+
 	(*encoder)(&buffer, val);
 
+	MemoryContextSwitchTo(oldcxt);
+	MemoryContextDelete(tmpcxt);
+
 	/*
 	 * Note: the JEntry of the root is discarded. Therefore the root
 	 * JsonbContainer struct must contain enough information to tell what kind
