Applied patch by Peter Harris to free auto_mem structure on connect

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 5e4524e791a429a7fb8ab5fb26e8d135296a6be1..95605f475fd0bd8788c5173c20747d0d497798fb 100644 (file)
--- 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
index 695444020795cb0849d8bba7eb78c2d45932c45f..12baaada4c0d444926a7e1c75d9a5b7777a28f69 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -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
index fc60eaa61669e88fd20773cc144e2b7b77fb1269..a2955df91419f0435d952957820348406edfd54b 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -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;