From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Mon, 31 Jul 2017 06:05:59 +0000 (+0900)
Subject: Fix a segfault on ResolveOneParam() function while executing a query after calling... 
X-Git-Tag: REL-09_06_0500~42
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/queryCache.php?a=commitdiff_plain;h=84883160aecd74ca6660ae8059be2bd9b6a4f970;p=psqlodbc.git

Fix a segfault on ResolveOneParam() function while executing a query after calling SQLSetStmtAttr(.., SQL_ATTR_APP_PARAM_DESC, an_ARD_for_another_statement, ..).
---

diff --git a/convert.c b/convert.c
index 8f94557..d50bf55 100644
--- a/convert.c
+++ b/convert.c
@@ -3694,7 +3694,14 @@ build_libpq_bind_params(StatementClass *stmt,
 	}
 	if (ipdopts->allocated < num_params)
 	{
-		SC_set_error(stmt, STMT_COUNT_FIELD_INCORRECT, "The # of binded parameters < the # of parameter markers", func);
+		char	tmp[100];
+
+		if (0 == ipdopts->allocated)
+			STRCPY_FIXED(tmp, "Parameters exist but IPD isn't set. Please call SQLDescribeParam()");
+		else
+			SPRINTF_FIXED(tmp, "The # of IPD parameters %d < %d the # of parameter markers", ipdopts->allocated, num_params);
+		mylog("%s:%s\n", __FUNCTION__, tmp);
+		SC_set_error(stmt, STMT_COUNT_FIELD_INCORRECT, tmp, func);
 		return FALSE;
 	}
 
@@ -4090,7 +4097,7 @@ inolog("resolveOneParam %d(%d,%d)\n", param_number, ipdopts->allocated, apdopts-
 		ipara = ipdopts->parameters + param_number;
 	if ((!apara || !ipara) && valueOutput)
 	{
-mylog("!!! The # of binded parameters (%d, %d) < the # of parameter markers %d\n", apdopts->allocated, ipdopts->allocated, param_number);
+		mylog("%s:The # of (A|I)PD parameters (%d, %d) < %d the # of parameter markers\n", __FUNCTION__, apdopts->allocated, ipdopts->allocated, param_number);
 		qb->errormsg = "The # of binded parameters < the # of parameter markers";
 		qb->errornumber = STMT_COUNT_FIELD_INCORRECT;
 		CVT_TERMINATE(qb);	/* just in case */
@@ -4235,6 +4242,15 @@ inolog("ipara=%p paramType=%d %d proc_return=%d\n", ipara, ipara ? ipara->paramT
 	/* XXX: should we use param_pgtype here instead? */
 	*pgType = sqltype_to_bind_pgtype(conn, param_sqltype);
 
+	if (0 == param_sqltype) /* calling SQLSetStmtAttr(.., SQL_ATTR_APP_PARAM_DES, an ARD of another statement) may cause this */
+	{
+		if (0 != param_pgtype)
+		{
+			param_sqltype = pgtype_attr_to_concise_type(conn, param_pgtype, PG_ATP_UNSET, PG_ADT_UNSET, PG_UNKNOWNS_UNSET);
+			mylog("%s: convert from pgtype(%u) to sqltype(%d)\n", __FUNCTION__, param_pgtype, param_sqltype);
+		}
+	}
+
 	mylog("%s: from(fcType)=%d, to(fSqlType)=%d(%u), *pgType=%u\n", func,
 		  param_ctype, param_sqltype, param_pgtype, *pgType);
 
@@ -4905,6 +4921,12 @@ mylog("cvt_null_date_string=%d pgtype=%d send_buf=%p\n", conn->connInfo.cvt_null
 			break;
 	}
 
+	if (!send_buf)
+	{
+		qb->errormsg = "Could not convert parameter ctype to sqltype";
+		qb->errornumber = STMT_EXEC_ERROR;
+		goto cleanup;
+	}
 	if (used == SQL_NTS)
 		used = strlen(send_buf);