Skip to content

Commit 5f20f9f

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix result_type related stack corruption on LLP64 architectures
2 parents 1c3374c + 5a8622f commit 5f20f9f

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ PHP NEWS
3030
- Pcntl:
3131
. Fixed bug GH-8142 (Compilation error on cygwin). (David Carlier)
3232

33+
- PgSQL:
34+
. Fixed result_type related stack corruption on LLP64 architectures. (cmb)
35+
3336
- Sockets:
3437
. Fixed Solaris builds. (David Carlier)
3538

ext/pgsql/pgsql.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,7 +2021,7 @@ PHP_FUNCTION(pg_fetch_object)
20212021
PHP_FUNCTION(pg_fetch_all)
20222022
{
20232023
zval *result;
2024-
long result_type = PGSQL_ASSOC;
2024+
zend_long result_type = PGSQL_ASSOC;
20252025
PGresult *pgsql_result;
20262026
pgsql_result_handle *pg_result;
20272027

@@ -5879,7 +5879,7 @@ PHP_FUNCTION(pg_select)
58795879
pgsql_link_handle *link;
58805880
zend_string *table;
58815881
zend_ulong option = PGSQL_DML_EXEC;
5882-
long result_type = PGSQL_ASSOC;
5882+
zend_long result_type = PGSQL_ASSOC;
58835883
PGconn *pg_link;
58845884
zend_string *sql = NULL;
58855885

0 commit comments

Comments
 (0)