Applied patch by Peter Harris to free auto_mem structure on connect

Michael Meskes · Michael Meskes · commit 0c96e42797db · 2006-11-08T10:46:47.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -2149,5 +2149,9 @@ Th 14. Sep 09:47:03 CEST 2006
 
 	- Completely removed complex tests.
 	- Added missing constuctor/destructor for interval and date.
+
+We 8. Nov 10:53:42 CET 2006
+
+	- Applied patch by Peter Harris to free auto_mem struct in ECPGconnect.
 	- Set ecpg library version to 5.2.
 	- Set ecpg version to 4.2.1.
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.36 2006/10/04 00:30:11 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.37 2006/11/08 10:46:47 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -277,6 +277,9 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 
 	ECPGinit_sqlca(sqlca);
 
+	/* clear auto_mem structure because some error handling functions might access it */
+	ECPGclear_auto_mem();
+
 	if (INFORMIX_MODE(compat))
 	{
 		char	   *envname;
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/memory.c,v 1.7 2005/10/15 02:49:47 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/memory.c,v 1.8 2006/11/08 10:46:47 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -101,7 +101,7 @@ ECPGclear_auto_mem(void)
 {
 	struct auto_mem *am;
 
-	/* free just our own structure */
+	/* only free our own structure */
 	for (am = auto_allocs; am;)
 	{
 		struct auto_mem *act = am;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/memory.c,v 1.7 2005/10/15 02:49:47 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/memory.c,v 1.8 2006/11/08 10:46:47 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#define POSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include "postgres_fe.h"`
`@@ -101,7 +101,7 @@ ECPGclear_auto_mem(void)`
`101`	`101`	`{`
`102`	`102`	`struct auto_mem *am;`
`103`	`103`
`104`		`- /* free just our own structure */`
	`104`	`+ /* only free our own structure */`
`105`	`105`	`for (am = auto_allocs; am;)`
`106`	`106`	`{`
`107`	`107`	`struct auto_mem *act = am;`