Reset the Package->hctxRegular if package in state

CherkashinSergey · za-arthur · commit 9924cd26aa25 · 2019-01-21T15:31:37.000+03:00
"removed, but not committed yet".
diff --git a/expected/pg_variables_trans.out b/expected/pg_variables_trans.out
@@ -1705,6 +1705,12 @@ SELECT pgv_free();
  
 (1 row)
 
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
+ pgv_free 
+----------
+ 
+(1 row)
+
 SELECT * FROM pgv_list() ORDER BY package, name;
  package | name | is_transactional 
 ---------+------+------------------
diff --git a/pg_variables.c b/pg_variables.c
@@ -916,7 +916,11 @@ removePackageInternal(Package *package)
 	TransObject *transObject;
 
 	/* All regular variables will be freed */
-	MemoryContextDelete(package->hctxRegular);
+	if (package->hctxRegular)
+	{
+		MemoryContextDelete(package->hctxRegular);
+		package->hctxRegular = NULL;
+	}
 
 	/* Add to changes list */
 	transObject = &package->transObject;
diff --git a/sql/pg_variables_trans.sql b/sql/pg_variables_trans.sql
@@ -425,6 +425,7 @@ SELECT pgv_set('vars', 'regular', 'regular variable exists'::text);
 SELECT pgv_set('vars', 'trans1', 'trans1 variable exists'::text, true);
 BEGIN;
 SELECT pgv_free();
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
 SELECT * FROM pgv_list() ORDER BY package, name;
 SELECT pgv_set('vars', 'trans2', 'trans2 variable exists'::text, true);
 SELECT * FROM pgv_list() ORDER BY package, name;
