ecpg: Fix rare memory leaks

petere · petere · commit 8dd4d10d481e · 2012-03-08T22:21:12.000+02:00
found by Coverity
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
@@ -519,6 +519,10 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
 			ecpg_free(realname);
 		if (dbname)
 			ecpg_free(dbname);
+		if (conn_keywords)
+			ecpg_free(conn_keywords);
+		if (conn_values)
+			ecpg_free(conn_values);
 		free(this);
 		return false;
 	}
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1776,6 +1776,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 		{
 			setlocale(LC_NUMERIC, oldlocale);
 			ecpg_free(oldlocale);
+			free_statement(stmt);
 			va_end(args);
 			return (false);
 		}
@@ -1807,6 +1808,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 			ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
 			setlocale(LC_NUMERIC, oldlocale);
 			ecpg_free(oldlocale);
+			free_statement(stmt);
 			va_end(args);
 			return (false);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1776,6 +1776,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char`
`1776`	`1776`	`{`
`1777`	`1777`	`setlocale(LC_NUMERIC, oldlocale);`
`1778`	`1778`	`ecpg_free(oldlocale);`
	`1779`	`+ free_statement(stmt);`
`1779`	`1780`	`va_end(args);`
`1780`	`1781`	`return (false);`
`1781`	`1782`	`}`
`@@ -1807,6 +1808,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char`
`1807`	`1808`	`ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);`
`1808`	`1809`	`setlocale(LC_NUMERIC, oldlocale);`
`1809`	`1810`	`ecpg_free(oldlocale);`
	`1811`	`+ free_statement(stmt);`
`1810`	`1812`	`va_end(args);`
`1811`	`1813`	`return (false);`
`1812`	`1814`	`}`