Fix more thinkos in new ECPG "PREPARE AS" code.

tglsfdc · tglsfdc · commit 39fe881d3cf3 · 2019-05-26T10:39:11.000-04:00
ecpg_build_params() failed to check for ecpg_alloc failure in one newly-added code path, and leaked a temporary string in another path. Errors in commit a1dc6ab, spotted by Coverity.
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1454,13 +1454,21 @@ ecpg_build_params(struct statement *stmt)
 			if (stmt->statement_type == ECPGst_prepare ||
 				stmt->statement_type == ECPGst_exec_with_exprlist)
 			{
-				/* Add double quote both side for embedding statement name. */
-				char	   *str = ecpg_alloc(strlen(tobeinserted) + 2 + 1, stmt->lineno);
+				/* Need to double-quote the inserted statement name. */
+				char	   *str = ecpg_alloc(strlen(tobeinserted) + 2 + 1,
+											 stmt->lineno);
 
+				if (!str)
+				{
+					ecpg_free(tobeinserted);
+					ecpg_free_params(stmt, false);
+					return false;
+				}
 				sprintf(str, "\"%s\"", tobeinserted);
 				ecpg_free(tobeinserted);
 				tobeinserted = str;
 			}
+
 			if (!insert_tobeinserted(position, 2, stmt, tobeinserted))
 			{
 				ecpg_free_params(stmt, false);
@@ -1470,11 +1478,13 @@ ecpg_build_params(struct statement *stmt)
 		}
 		else if (stmt->statement_type == ECPGst_exec_with_exprlist)
 		{
-
 			if (binary_format)
 			{
-				char	   *p = convert_bytea_to_string(tobeinserted, binary_length, stmt->lineno);
+				char	   *p = convert_bytea_to_string(tobeinserted,
+														binary_length,
+														stmt->lineno);
 
+				ecpg_free(tobeinserted);
 				if (!p)
 				{
 					ecpg_free_params(stmt, false);

Original file line number	Diff line number	Diff line change
`@@ -1454,13 +1454,21 @@ ecpg_build_params(struct statement *stmt)`
`1454`	`1454`	`if (stmt->statement_type == ECPGst_prepare \|\|`
`1455`	`1455`	`stmt->statement_type == ECPGst_exec_with_exprlist)`
`1456`	`1456`	`{`
`1457`		`- /* Add double quote both side for embedding statement name. */`
`1458`		`- char *str = ecpg_alloc(strlen(tobeinserted) + 2 + 1, stmt->lineno);`
	`1457`	`+ /* Need to double-quote the inserted statement name. */`
	`1458`	`+ char *str = ecpg_alloc(strlen(tobeinserted) + 2 + 1,`
	`1459`	`+ stmt->lineno);`
`1459`	`1460`
	`1461`	`+ if (!str)`
	`1462`	`+ {`
	`1463`	`+ ecpg_free(tobeinserted);`
	`1464`	`+ ecpg_free_params(stmt, false);`
	`1465`	`+ return false;`
	`1466`	`+ }`
`1460`	`1467`	`sprintf(str, "\"%s\"", tobeinserted);`
`1461`	`1468`	`ecpg_free(tobeinserted);`
`1462`	`1469`	`tobeinserted = str;`
`1463`	`1470`	`}`
	`1471`	`+`
`1464`	`1472`	`if (!insert_tobeinserted(position, 2, stmt, tobeinserted))`
`1465`	`1473`	`{`
`1466`	`1474`	`ecpg_free_params(stmt, false);`
`@@ -1470,11 +1478,13 @@ ecpg_build_params(struct statement *stmt)`
`1470`	`1478`	`}`
`1471`	`1479`	`else if (stmt->statement_type == ECPGst_exec_with_exprlist)`
`1472`	`1480`	`{`
`1473`		`-`
`1474`	`1481`	`if (binary_format)`
`1475`	`1482`	`{`
`1476`		`- char *p = convert_bytea_to_string(tobeinserted, binary_length, stmt->lineno);`
	`1483`	`+ char *p = convert_bytea_to_string(tobeinserted,`
	`1484`	`+ binary_length,`
	`1485`	`+ stmt->lineno);`
`1477`	`1486`
	`1487`	`+ ecpg_free(tobeinserted);`
`1478`	`1488`	`if (!p)`
`1479`	`1489`	`{`
`1480`	`1490`	`ecpg_free_params(stmt, false);`