summaryrefslogtreecommitdiff
path: root/ext/mysqlnd
diff options
context:
space:
mode:
authorguirish <root@eocs0030.pok.stglabs.ibm.com>2020-04-10 05:45:40 -0400
committerNikita Popov <nikita.ppv@gmail.com>2020-04-16 11:22:17 +0200
commita1c1736bfb88d006542dc9bcc10d7101617517a6 (patch)
tree829376a6901dc791c50fd3c50deb0c7abfbf53f4 /ext/mysqlnd
parent79a36ff7f33194cf08ebe511bd828e1cdaea8e41 (diff)
downloadphp-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/mysqlnd')
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index b2017b9127..d93a5ed7b1 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -1899,8 +1899,8 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s,
break;
}
case STMT_ATTR_CURSOR_TYPE: {
- unsigned int ival = *(unsigned int *) value;
- if (ival > (zend_ulong) CURSOR_TYPE_READ_ONLY) {
+ unsigned long ival = *(unsigned long *) value;
+ if (ival > (unsigned long) CURSOR_TYPE_READ_ONLY) {
SET_CLIENT_ERROR(stmt->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented");
DBG_INF("FAIL");
DBG_RETURN(FAIL);
@@ -1909,7 +1909,7 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_set)(MYSQLND_STMT * const s,
break;
}
case STMT_ATTR_PREFETCH_ROWS: {
- unsigned int ival = *(unsigned int *) value;
+ unsigned long ival = *(unsigned long *) value;
if (ival == 0) {
ival = MYSQLND_DEFAULT_PREFETCH_ROWS;
} else if (ival > 1) {
@@ -1948,10 +1948,10 @@ MYSQLND_METHOD(mysqlnd_stmt, attr_get)(const MYSQLND_STMT * const s,
*(zend_bool *) value= stmt->update_max_length;
break;
case STMT_ATTR_CURSOR_TYPE:
- *(zend_ulong *) value= stmt->flags;
+ *(unsigned long *) value= stmt->flags;
break;
case STMT_ATTR_PREFETCH_ROWS:
- *(zend_ulong *) value= stmt->prefetch_rows;
+ *(unsigned long *) value= stmt->prefetch_rows;
break;
default:
DBG_RETURN(FAIL);