Fix double detoasting of compressed jsonbs

Nikita Glukhov · Nikita Glukhov · commit 6de0f21d461e · 2021-03-29T20:40:14.000+03:00
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -2913,15 +2913,13 @@ jsonbzIteratorInit(JsonContainer *jc)
 }
 
 static void
-jsonbzInit(JsonContainerData *jc, Datum value)
+jsonbzInitFromCompresedDatum(JsonContainerData *jc, CompressedDatum *cd)
 {
 	CompressedJsonb *cjb = palloc(sizeof(*cjb));
-	CompressedDatum *cd = palloc(sizeof(*cd));
 
 	cjb->datum = cd;
 	cjb->offset = offsetof(Jsonb, root);
 
-	CompressedDatumInit(cd, value);
 	if (!jsonb_partial_decompression)
 		CompressedDatumDecompressAll(cd);
 	else
@@ -2930,6 +2928,16 @@ jsonbzInit(JsonContainerData *jc, Datum value)
 	jsonbzInitContainer(jc, cjb, VARSIZE_ANY_EXHDR(cd->data)); // cd->total_len - VARHDRSZ
 }
 
+static void
+jsonbzInit(JsonContainerData *jc, Datum value)
+{
+	CompressedDatum *cd = palloc(sizeof(*cd));
+
+	CompressedDatumInit(cd, value);
+
+	jsonbzInitFromCompresedDatum(jc, cd);
+}
+
 JsonContainerOps
 jsonbzContainerOps =
 {
@@ -2973,7 +2981,8 @@ DatumGetJsonbPC(Datum datum, Json *tmp, bool copy)
 
 	js = JsonExpand(tmp, (Datum) 0, false, &jsonbzContainerOps);
 
-	jsonbzInit(&js->root, datum);
+	jsonbzInitFromCompresedDatum(&js->root,
+								 memcpy(palloc(sizeof(cd)), &cd, sizeof(cd)));
 
 	return js;
 }
