From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 29 Sep 2020 09:05:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into master
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f5eba1d7ade71c48d575547f6f8d9d73e23a9f9;p=php

Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #80150: Failure to fetch error message
---

5f5eba1d7ade71c48d575547f6f8d9d73e23a9f9
diff --cc ext/odbc/php_odbc.c
index bfb72bcff7,1f6fd3ad73..60f5a80f94
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@@ -2779,13 -3149,13 +2779,13 @@@ PHP_FUNCTION(odbc_tables
  	}
  
  	rc = SQLTables(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema,	SAFE_SQL_NTS(schema),
 -			table, SAFE_SQL_NTS(table),
 -			type, SAFE_SQL_NTS(type));
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema,	SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) table, SAFE_SQL_NTS(table),
 +			(SQLCHAR *) type, SAFE_SQL_NTS(type));
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTables");
+ 		odbc_sql_error(conn, result->stmt, "SQLTables");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -2849,13 -3220,13 +2849,13 @@@ PHP_FUNCTION(odbc_columns
  	}
  
  	rc = SQLColumns(result->stmt,
 -			cat, (SQLSMALLINT) cat_len,
 -			schema, (SQLSMALLINT) schema_len,
 -			table, (SQLSMALLINT) table_len,
 -			column, (SQLSMALLINT) column_len);
 +			(SQLCHAR *) cat, (SQLSMALLINT) cat_len,
 +			(SQLCHAR *) schema, (SQLSMALLINT) schema_len,
 +			(SQLCHAR *) table, (SQLSMALLINT) table_len,
 +			(SQLCHAR *) column, (SQLSMALLINT) column_len);
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLColumns");
+ 		odbc_sql_error(conn, result->stmt, "SQLColumns");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -2913,13 -3285,13 +2913,13 @@@ PHP_FUNCTION(odbc_columnprivileges
  	}
  
  	rc = SQLColumnPrivileges(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema, SAFE_SQL_NTS(schema),
 -			table, SAFE_SQL_NTS(table),
 -			column, SAFE_SQL_NTS(column));
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema, SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) table, SAFE_SQL_NTS(table),
 +			(SQLCHAR *) column, SAFE_SQL_NTS(column));
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLColumnPrivileges");
+ 		odbc_sql_error(conn, result->stmt, "SQLColumnPrivileges");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -2990,15 -3363,15 +2990,15 @@@ PHP_FUNCTION(odbc_foreignkeys
  	}
  
  	rc = SQLForeignKeys(result->stmt,
 -			pcat, SAFE_SQL_NTS(pcat),
 -			pschema, SAFE_SQL_NTS(pschema),
 -			ptable, SAFE_SQL_NTS(ptable),
 -			fcat, SAFE_SQL_NTS(fcat),
 -			fschema, SAFE_SQL_NTS(fschema),
 -			ftable, SAFE_SQL_NTS(ftable) );
 +			(SQLCHAR *) pcat, SAFE_SQL_NTS(pcat),
 +			(SQLCHAR *) pschema, SAFE_SQL_NTS(pschema),
 +			(SQLCHAR *) ptable, SAFE_SQL_NTS(ptable),
 +			(SQLCHAR *) fcat, SAFE_SQL_NTS(fcat),
 +			(SQLCHAR *) fschema, SAFE_SQL_NTS(fschema),
 +			(SQLCHAR *) ftable, SAFE_SQL_NTS(ftable) );
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLForeignKeys");
+ 		odbc_sql_error(conn, result->stmt, "SQLForeignKeys");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -3115,12 -3490,12 +3115,12 @@@ PHP_FUNCTION(odbc_primarykeys
  	}
  
  	rc = SQLPrimaryKeys(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema, SAFE_SQL_NTS(schema),
 -			table, SAFE_SQL_NTS(table) );
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema, SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) table, SAFE_SQL_NTS(table) );
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLPrimaryKeys");
+ 		odbc_sql_error(conn, result->stmt, "SQLPrimaryKeys");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -3178,13 -3558,13 +3178,13 @@@ PHP_FUNCTION(odbc_procedurecolumns
  	}
  
  	rc = SQLProcedureColumns(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema, SAFE_SQL_NTS(schema),
 -			proc, SAFE_SQL_NTS(proc),
 -			col, SAFE_SQL_NTS(col) );
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema, SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) proc, SAFE_SQL_NTS(proc),
 +			(SQLCHAR *) col, SAFE_SQL_NTS(col) );
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLProcedureColumns");
+ 		odbc_sql_error(conn, result->stmt, "SQLProcedureColumns");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -3242,12 -3627,12 +3242,12 @@@ PHP_FUNCTION(odbc_procedures
  	}
  
  	rc = SQLProcedures(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema, SAFE_SQL_NTS(schema),
 -			proc, SAFE_SQL_NTS(proc) );
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema, SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) proc, SAFE_SQL_NTS(proc) );
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLProcedures");
+ 		odbc_sql_error(conn, result->stmt, "SQLProcedures");
  		efree(result);
  		RETURN_FALSE;
  	}
@@@ -3444,12 -3833,12 +3444,12 @@@ PHP_FUNCTION(odbc_tableprivileges
  	}
  
  	rc = SQLTablePrivileges(result->stmt,
 -			cat, SAFE_SQL_NTS(cat),
 -			schema, SAFE_SQL_NTS(schema),
 -			table, SAFE_SQL_NTS(table));
 +			(SQLCHAR *) cat, SAFE_SQL_NTS(cat),
 +			(SQLCHAR *) schema, SAFE_SQL_NTS(schema),
 +			(SQLCHAR *) table, SAFE_SQL_NTS(table));
  
  	if (rc == SQL_ERROR) {
- 		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTablePrivileges");
+ 		odbc_sql_error(conn, result->stmt, "SQLTablePrivileges");
  		efree(result);
  		RETURN_FALSE;
  	}