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 | |
| 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
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rw-r--r-- | ext/odbc/tests/bug78470.phpt | 15 |
3 files changed, 19 insertions, 1 deletions
@@ -14,6 +14,9 @@ PHP NEWS . Fixed bug #80107 (mysqli_query() fails for ~16 MB long query when compression is enabled). (Nikita) +- ODBC: + . Fixed bug #78470 (odbc_specialcolumns() no longer accepts $nullable). (cmb) + - OPcache: . Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data binding). (Nikita) 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; } diff --git a/ext/odbc/tests/bug78470.phpt b/ext/odbc/tests/bug78470.phpt new file mode 100644 index 0000000000..6910f9bbd1 --- /dev/null +++ b/ext/odbc/tests/bug78470.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #78470 (odbc_specialcolumns() no longer accepts $nullable) +--SKIPIF-- +<?php +if (!extension_loaded('odbc')) die('skip odbc extension not available'); +?> +--FILE-- +<?php +include 'config.inc'; + +$conn = odbc_connect($dsn, $user, $pass); +var_dump(odbc_specialcolumns($conn, SQL_BEST_ROWID, '', '', '', SQL_SCOPE_CURROW, SQL_NO_NULLS)); +?> +--EXPECTF-- +resource(%d) of type (odbc result) |