Fix PG_FREE_IF_COPY() macro for expanded objects

Nikita Glukhov · Nikita Glukhov · commit 97969a631692 · 2017-05-02T21:38:29.000+03:00
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
@@ -226,7 +226,9 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena * datum);
  */
 #define PG_FREE_IF_COPY(ptr,n) \
 	do { \
-		if ((Pointer) (ptr) != PG_GETARG_POINTER(n)) \
+		if ((Pointer) (ptr) != PG_GETARG_POINTER(n) && \
+			(!VARATT_IS_EXTERNAL_EXPANDED(PG_GETARG_POINTER(n)) || \
+			 (Pointer) DatumGetEOHP(PG_GETARG_DATUM(n)) != (Pointer)(ptr))) \
 			pfree(ptr); \
 	} while (0)
 
