Added some more coverity report patches send in by Joachim Wieland <joe@mcknight...

diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index f45655b6f3e579e7c09dffeb7831d01c9a688f89..3e1189382dca8d94809c5353d225989be5d59641 100644 (file)
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -415,6 +415,7 @@ dectoint(decimal *np, int *ip)
    }
 
    ret = PGTYPESnumeric_to_int(nres, ip);
+   PGTYPESnumeric_free(nres);
 
    if (ret == PGTYPES_NUM_OVERFLOW)
        ret = ECPG_INFORMIX_NUM_OVERFLOW;

diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index bc2300e5fa16abe7f4cb4cc8c09b00d38b6bec40..84341a67da3dfd9b6ce2960f27fc3906577a7860 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.38.4.7 2006/06/25 10:00:11 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.38.4.8 2006/06/26 09:20:30 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -879,16 +879,16 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
            case ECPGt_numeric:
                {
                    char       *str = NULL;
-                   int         slen;
+                   int     slen;
                    numeric    *nval = PGTYPESnumeric_new();
 
-                   if (!nval)
-                       return false;
-
                    if (var->arrsize > 1)
                    {
                        for (element = 0; element < var->arrsize; element++, nval = PGTYPESnumeric_new())
                        {
+                           if (!nval)
+                               return false;
+                               
                            if (var->type == ECPGt_numeric)
                                PGTYPESnumeric_copy((numeric *) ((var + var->offset * element)->value), nval);
                            else
@@ -896,10 +896,10 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
 
                            str = PGTYPESnumeric_to_asc(nval, nval->dscale);
                            slen = strlen(str);
+                           PGTYPESnumeric_free(nval);
 
                            if (!(mallocedval = ECPGrealloc(mallocedval, strlen(mallocedval) + slen + sizeof("array [] "), lineno)))
                            {
-                               PGTYPESnumeric_free(nval);
                                ECPGfree(str);
                                return false;
                            }
@@ -910,24 +910,25 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
                            strncpy(mallocedval + strlen(mallocedval), str, slen + 1);
                            strcpy(mallocedval + strlen(mallocedval), ",");
                            ECPGfree(str);
-                           PGTYPESnumeric_free(nval);
                        }
                        strcpy(mallocedval + strlen(mallocedval) - 1, "]");
                    }
                    else
                    {
+                       if (!nval)
+                           return false;
+
                        if (var->type == ECPGt_numeric)
                            PGTYPESnumeric_copy((numeric *) (var->value), nval);
                        else
                            PGTYPESnumeric_from_decimal((decimal *) (var->value), nval);
 
                        str = PGTYPESnumeric_to_asc(nval, nval->dscale);
-
                        slen = strlen(str);
+                       PGTYPESnumeric_free(nval);
 
                        if (!(mallocedval = ECPGalloc(slen + 1, lineno)))
                        {
-                           PGTYPESnumeric_free(nval);
                            free(str);
                            return false;
                        }
@@ -935,7 +936,6 @@ ECPGstore_input(const int lineno, const bool force_indicator, const struct varia
                        strncpy(mallocedval, str, slen);
                        mallocedval[slen] = '\0';
                        ECPGfree(str);
-                       PGTYPESnumeric_free(nval);
                    }
 
                    *tobeinserted_p = mallocedval;