Do not eat memory even in case of an out-of-memory error.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 928d412c953f3d5b90743ac3577ed4993d42ac63..3d8d6ab25f6e5da8c48465177aa72dadbeaa80aa 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2386,6 +2386,10 @@ Fri, 10 Oct 2008 14:03:05 +0200
 Tue, 14 Oct 2008 11:25:51 +0200
 
        - Fixed parameter parsing.
+
+Sat, 25 Oct 2008 16:34:28 +0200
+
+       - Free allocated memory even if the next alloc failed with ENOMEM.
        - Set pgtypes library version to 3.1.
        - Set compat library version to 3.1.
        - Set ecpg library version to 6.2.

diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index c3c8749cf8f094da5c5d178615b23aada465dbeb..b5ee3e6738649c3a4eea1a72a71a8948e38f966c 100644 (file)
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.55 2008/05/16 15:20:03 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.56 2008/11/01 08:55:21 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -755,10 +755,16 @@ rfmtlong(long lng_val, char *fmt, char *outbuf)
                                fmtchar = ' ';
 
        temp = (char *) malloc(fmt_len + 1);
+       if (!temp)
+       {
+               errno = ENOMEM;
+               return -1;
+       }
 
        /* put all info about the long in a struct */
-       if (!temp || initValue(lng_val) == -1)
+       if (initValue(lng_val) == -1)
        {
+               free(temp);
                errno = ENOMEM;
                return -1;
        }