Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix result_type related stack corruption on LLP64 architectures
This commit is contained in:
Christoph M. Becker 2022-03-28 18:30:05 +02:00
commit 072b09fd35
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6

View file

@ -2021,7 +2021,7 @@ PHP_FUNCTION(pg_fetch_object)
PHP_FUNCTION(pg_fetch_all)
{
zval *result;
long result_type = PGSQL_ASSOC;
zend_long result_type = PGSQL_ASSOC;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
@ -5879,7 +5879,7 @@ PHP_FUNCTION(pg_select)
pgsql_link_handle *link;
zend_string *table;
zend_ulong option = PGSQL_DML_EXEC;
long result_type = PGSQL_ASSOC;
zend_long result_type = PGSQL_ASSOC;
PGconn *pg_link;
zend_string *sql = NULL;