Fixed two more memory leaks in ecpglib.

Michael Meskes · Michael Meskes · commit 0251602fc9b8 · 2006-06-06T11:31:55.000Z
Synced parser.
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.30 2006/01/17 19:49:23 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.31 2006/06/06 11:31:55 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -462,7 +462,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						nres = PGTYPESnumeric_from_asc(pval, &scan_length);
 
 					/* did we get an error? */
-					if (errno != 0)
+					if (nres == NULL)
 					{
 						ECPGlog("ECPGget_data line %d: RESULT: %s errno %d\n", lineno, pval ? pval : "", errno);
 
@@ -487,6 +487,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 						if (garbage_left(isarray, scan_length, compat))
 						{
+							free(nres);
 							ECPGraise(lineno, ECPG_NUMERIC_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
@@ -500,6 +501,8 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					PGTYPESnumeric_copy(nres, (numeric *) (var + offset * act_tuple));
 				else
 					PGTYPESnumeric_to_decimal(nres, (decimal *) (var + offset * act_tuple));
+
+				free(nres);
 				break;
 
 			case ECPGt_interval:
@@ -511,7 +514,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						ires = PGTYPESinterval_from_asc(pval, &scan_length);
 
 					/* did we get an error? */
-					if (errno != 0)
+					if (ires == NULL)
 					{
 						if (INFORMIX_MODE(compat))
 						{
@@ -534,6 +537,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 						if (garbage_left(isarray, scan_length, compat))
 						{
+							free(ires);
 							ECPGraise(lineno, ECPG_INTERVAL_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
 							return (false);
 						}
@@ -544,6 +548,7 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					ires = PGTYPESinterval_from_asc("0 seconds", NULL);
 
 				PGTYPESinterval_copy(ires, (interval *) (var + offset * act_tuple));
+				free(ires);
 				break;
 			case ECPGt_date:
 				if (pval)
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.31 2006/03/11 04:38:39 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.32 2006/06/06 11:31:55 meskes Exp $ */
 
 #include "postgres_fe.h"
 #include <time.h>
@@ -793,6 +793,7 @@ PGTYPESinterval_from_asc(char *str, char **endptr)
 		return NULL;
 	}
 
+	errno = 0;
 	return result;
 }
 
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.31 2006/03/11 04:38:39 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.32 2006/06/06 11:31:55 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include "postgres_fe.h"`
`4`	`4`	`#include <time.h>`
`@@ -793,6 +793,7 @@ PGTYPESinterval_from_asc(char str, char *endptr)`
`793`	`793`	`return NULL;`
`794`	`794`	`}`
`795`	`795`
	`796`	`+ errno = 0;`
`796`	`797`	`return result;`
`797`	`798`	`}`
`798`	`799`