diff options
| author | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-13 19:02:22 +0200 |
| commit | 766eb0103fe8f59c00ddadc5c5767093ee35b2e8 (patch) | |
| tree | f11b01c33784791330f5f524faed6dab9c04766b /ext | |
| parent | 19c41e1f538e854fa8450715791c44f55e909588 (diff) | |
| parent | 65eb8ef8d040976e81b5f7b11e74013218cd1428 (diff) | |
| download | php-git-766eb0103fe8f59c00ddadc5c5767093ee35b2e8.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix several datatype mismatch warnings
fix signed/unsigned mismatch warning
more signed/unsigned mismatch fix
fix signed/unsigned mismatch warning
fix signed/unsigned mismatch
fix some signed/unsigned mismatch
missing include for strlen proto
More fixes for array/object casts with temporary variables
Fix array/object cast of refcounted tmp var
Deref right value for compound assign ops
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 | ||||
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/encodings.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 4eff098999..69799729b7 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -791,7 +791,7 @@ PHP_FUNCTION(mysqli_data_seek) RETURN_FALSE; } - if (offset < 0 || offset >= mysql_num_rows(result)) { + if (offset < 0 || (uint64_t)offset >= mysql_num_rows(result)) { RETURN_FALSE; } diff --git a/ext/xmlrpc/libxmlrpc/encodings.c b/ext/xmlrpc/libxmlrpc/encodings.c index f4cc212d7c..467dca922e 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -44,6 +44,7 @@ static const char rcsid[] = "#(@) $Id$"; #include <errno.h> +#include <string.h> #ifdef HAVE_GICONV_H #include <giconv.h> |