diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 22:53:50 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-02-17 22:54:16 +0100 |
| commit | 3090c88f55f53d0a8af4e9dbec2664a24c1fa702 (patch) | |
| tree | 1f9bf4fec55e7ecce081437b15cf6e0fc64fc7ac /ext/pdo_odbc/php_pdo_odbc_int.h | |
| parent | 8db8d66df0e4b7cf202120273ab9c5d01a3f0d1c (diff) | |
| parent | 08073b06581c6dc9234cfb2e9b187a598154c8ab (diff) | |
| download | php-git-3090c88f55f53d0a8af4e9dbec2664a24c1fa702.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79038: PDOStatement::nextRowset() leaks column values
Diffstat (limited to 'ext/pdo_odbc/php_pdo_odbc_int.h')
| -rw-r--r-- | ext/pdo_odbc/php_pdo_odbc_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo_odbc/php_pdo_odbc_int.h b/ext/pdo_odbc/php_pdo_odbc_int.h index e6098f4951..922b89a686 100644 --- a/ext/pdo_odbc/php_pdo_odbc_int.h +++ b/ext/pdo_odbc/php_pdo_odbc_int.h @@ -151,7 +151,8 @@ typedef struct { zend_ulong convbufsize; unsigned going_long:1; unsigned assume_utf8:1; - unsigned _spare:30; + signed col_count:16; + unsigned _spare:14; } pdo_odbc_stmt; typedef struct { |