diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-24 12:16:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-24 12:16:54 +0200 |
| commit | 901d02200152492d6292b418bb35e80084d5d140 (patch) | |
| tree | e0ae0d337b8270f50942d0d5c19be5f2d5d63679 /ext/odbc/php_odbc.c | |
| parent | a89ac98f151d837c6128474aabcbdf2b6cb3bb76 (diff) | |
| parent | 610e7d2c77f7af3cc69399e0fdcca0d99300e2ce (diff) | |
| download | php-git-901d02200152492d6292b418bb35e80084d5d140.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78470: odbc_specialcolumns() no longer accepts $nullable
Diffstat (limited to 'ext/odbc/php_odbc.c')
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index ce11e0a3fc..d8cbe65c58 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -3667,7 +3667,7 @@ PHP_FUNCTION(odbc_specialcolumns) SQLUSMALLINT type, scope, nullable; RETCODE rc; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rls!ssl", &pv_conn, &vtype, &cat, &cat_len, &schema, &schema_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rls!ssll", &pv_conn, &vtype, &cat, &cat_len, &schema, &schema_len, &name, &name_len, &vscope, &vnullable) == FAILURE) { return; } |