diff options
| author | guirish <root@eocs0030.pok.stglabs.ibm.com> | 2020-04-10 05:45:40 -0400 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-16 11:22:17 +0200 |
| commit | a1c1736bfb88d006542dc9bcc10d7101617517a6 (patch) | |
| tree | 829376a6901dc791c50fd3c50deb0c7abfbf53f4 /ext/pdo_mysql/mysql_driver.c | |
| parent | 79a36ff7f33194cf08ebe511bd828e1cdaea8e41 (diff) | |
| download | php-git-a1c1736bfb88d006542dc9bcc10d7101617517a6.tar.gz | |
Fix MySQL local infile / attr handling on big endian systems
Make sure pointer types match what is used by libmysql everywhere.
Closes GH-5380.
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index b7b6770327..6431ccf4e1 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -628,7 +628,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* handle MySQL options */ if (driver_options) { zend_long connect_timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, 30); - zend_long local_infile = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_LOCAL_INFILE, 0); + unsigned int local_infile = (unsigned int) pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_LOCAL_INFILE, 0); zend_string *init_cmd = NULL; #ifndef PDO_USE_MYSQLND zend_string *default_file = NULL, *default_group = NULL; @@ -779,7 +779,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) } else { #if defined(MYSQL_OPT_LOCAL_INFILE) || defined(PDO_USE_MYSQLND) // in case there are no driver options disable 'local infile' explicitly - zend_long local_infile = 0; + unsigned int local_infile = 0; if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const char *)&local_infile)) { pdo_mysql_error(dbh); goto cleanup; |