In ecpglib restore LC_NUMERIC in case of an error.

Michael Meskes · Michael Meskes · commit 63d06ef59156 · 2011-09-01T15:46:12.000+02:00
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1772,8 +1772,12 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 	 */
 	if (statement_type == ECPGst_prepnormal)
 	{
-		if (!ecpg_auto_prepare(lineno, connection_name, compat, &prepname, query))
+		if (!ecpg_auto_prepare(lineno, connection_name, compat, &prepname, query)) {
+			setlocale(LC_NUMERIC, oldlocale);
+			ecpg_free(oldlocale);
+			va_end(args);
 			return (false);
+		}
 
 		/*
 		 * statement is now prepared, so instead of the query we have to
@@ -1800,6 +1804,9 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 		else
 		{
 			ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
+			setlocale(LC_NUMERIC, oldlocale);
+			ecpg_free(oldlocale);
+			va_end(args);
 			return (false);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1772,8 +1772,12 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char`
`1772`	`1772`	`*/`
`1773`	`1773`	`if (statement_type == ECPGst_prepnormal)`
`1774`	`1774`	`{`
`1775`		`- if (!ecpg_auto_prepare(lineno, connection_name, compat, &prepname, query))`
	`1775`	`+ if (!ecpg_auto_prepare(lineno, connection_name, compat, &prepname, query)) {`
	`1776`	`+ setlocale(LC_NUMERIC, oldlocale);`
	`1777`	`+ ecpg_free(oldlocale);`
	`1778`	`+ va_end(args);`
`1776`	`1779`	`return (false);`
	`1780`	`+ }`
`1777`	`1781`
`1778`	`1782`	`/*`
`1779`	`1783`	`* statement is now prepared, so instead of the query we have to`
`@@ -1800,6 +1804,9 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char`
`1800`	`1804`	`else`
`1801`	`1805`	`{`
`1802`	`1806`	`ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);`
	`1807`	`+ setlocale(LC_NUMERIC, oldlocale);`
	`1808`	`+ ecpg_free(oldlocale);`
	`1809`	`+ va_end(args);`
`1803`	`1810`	`return (false);`
`1804`	`1811`	`}`
`1805`	`1812`	`}`