diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-22 12:45:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-22 12:45:16 +0200 |
| commit | f308aa4e1e19b91f68643891145a759136567edb (patch) | |
| tree | ccc825aad29584d2f46784ec6edf4f553a725133 | |
| parent | 69c634a56d55c4d0157ed3cf27f5fb39ffbfa189 (diff) | |
| parent | 96404eb8e223bde0f5f697987a81acb640cc539f (diff) | |
| download | php-git-f308aa4e1e19b91f68643891145a759136567edb.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug77956.phpt | 50 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_loaddata.c | 2 |
3 files changed, 56 insertions, 0 deletions
@@ -10,6 +10,10 @@ PHP NEWS . Fixed bug #78025 (segfault when accessing properties of DOMDocumentType). (cmb) +- MySQLi: + . Fixed bug #77956 (When mysqli.allow_local_infile = Off, use a meaningful + error message). (Sjon Hortensius) + - Opcache: . Fixed bug #78015 (Incorrect evaluation of expressions involving partials arrays in SCCP). (Nikita) diff --git a/ext/mysqli/tests/bug77956.phpt b/ext/mysqli/tests/bug77956.phpt new file mode 100644 index 0000000000..b3c7943c93 --- /dev/null +++ b/ext/mysqli/tests/bug77956.phpt @@ -0,0 +1,50 @@ +--TEST-- +ensure an error is returned when mysqli.allow_local_infile is off +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--INI-- +mysqli.allow_local_infile=0 +--FILE-- +<?php + require_once("connect.inc"); + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + if (!$link->query("DROP TABLE IF EXISTS test")) { + printf("[002] [%d] %s\n", $link->errno, $link->error); + } + if (!$link->query("CREATE TABLE test (dump1 INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=" . $engine)) { + printf("[003] [%d] %s\n", $link->errno, $link->error); + } + if (FALSE == file_put_contents('bug77956.data', "waa? meukee!")) + printf("[004] Failed to create CVS file\n"); + if (!$link->query("SELECT 1 FROM DUAL")) + printf("[005] [%d] %s\n", $link->errno, $link->error); + if (!$link->query("LOAD DATA LOCAL INFILE 'bug77956.data' INTO TABLE test")) { + printf("[006] [%d] %s\n", $link->errno, $link->error); + echo "done"; + } else { + echo "bug"; + } + $link->close(); +?> +--CLEAN-- +<?php +require_once('connect.inc'); +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); +} +if (!$link->query($link, 'DROP TABLE IF EXISTS test')) { + printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +} +$link->close(); +unlink('bug77956.data'); +?> +--EXPECTF-- +Warning: mysqli::query(): LOAD DATA LOCAL INFILE forbidden in %s on line %d +[006] [2000] LOAD DATA LOCAL INFILE is forbidden, check mysqli.allow_local_infile +done diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c index a77961717d..a7d4163693 100644 --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@ -156,6 +156,8 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * const filenam if (!(conn->options->flags & CLIENT_LOCAL_FILES)) { php_error_docref(NULL, E_WARNING, "LOAD DATA LOCAL INFILE forbidden"); + SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, + "LOAD DATA LOCAL INFILE is forbidden, check mysqli.allow_local_infile"); /* write empty packet to server */ ret = net->data->m.send(net, vio, empty_packet, 0, conn->stats, conn->error_info); *is_warning = TRUE; |