[patch] php-8.1.30-pgo-odbc-gcc14.patch

php-8.1.30-pgo-odbc-gcc14.patch (text/plain), 1.13 KB, created by Attila Tóth on 2024-10-26 12:25:11 UTC

diff '--color=auto' -urNp php-8.1.30-orig/ext/pdo_odbc/odbc_driver.c php-8.1.30-dwok/ext/pdo_odbc/odbc_driver.c
--- php-8.1.30-orig/ext/pdo_odbc/odbc_driver.c	2024-10-26 13:38:23.089765439 +0200
+++ php-8.1.30-dwok/ext/pdo_odbc/odbc_driver.c	2024-10-26 13:41:44.773268803 +0200
@@ -83,7 +83,7 @@ void pdo_odbc_error(pdo_dbh_t *dbh, pdo_
 		eh = H->env;
 	}
 
-	rc = SQLGetDiagRec(htype, eh, recno++, (SQLCHAR *) einfo->last_state, &einfo->last_error,
+	rc = SQLGetDiagRec(htype, eh, recno++, (SQLCHAR *) einfo->last_state, (SQLINTEGER *) &einfo->last_error,
 			(SQLCHAR *) einfo->last_err_msg, sizeof(einfo->last_err_msg)-1, &errmsgsize);
 
 	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
@@ -98,7 +98,7 @@ void pdo_odbc_error(pdo_dbh_t *dbh, pdo_
 	strcpy(*pdo_err, einfo->last_state);
 /* printf("@@ SQLSTATE[%s] %s\n", *pdo_err, einfo->last_err_msg); */
 	if (!dbh->methods) {
-		zend_throw_exception_ex(php_pdo_get_exception(), einfo->last_error, "SQLSTATE[%s] %s: %d %s",
+		zend_throw_exception_ex(php_pdo_get_exception(), einfo->last_error, "SQLSTATE[%s] %s: %ld %s",
 				*pdo_err, what, einfo->last_error, einfo->last_err_msg);
 	}