com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend _exceptions.c
ext/fileinfo/libmagic/softmagic.c ext/g d/gd.c
| From: | Anatol Belski | Date: | Thu, 20 Feb 2014 19:34:12 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend _exceptions.c ext/fileinfo/libmagic/softmagic.c ext/g d/gd.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76143@lists.php.net to get a copy of this message | ||
Commit: a30ef13ad850fe7f57c4dcb720fd09e6e6fe80d0
Author: Anatol Belski <ab@php.net> Thu, 20 Feb 2014 20:34:12 +0100
Parents: 465fe9f0de93b866d90cf8edb7d54f11e909e8f9 b67c8b8603f7fa3914f51deefa5a265315179d80
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a30ef13ad850fe7f57c4dcb720fd09e6e6fe80d0
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Changed paths:
MM Zend/zend_exceptions.c
MM ext/fileinfo/libmagic/softmagic.c
MM ext/gd/gd.c
Diff:
diff --cc Zend/zend_exceptions.c
index 333b5eb,9b7d368..4e36609
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@@ -367,13 -370,13 +372,13 @@@ ZEND_METHOD(error_exception, getSeverit
static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_hash_key
*hash_key) /* {{{ */
{
char **str;
- int *len;
+ zend_size_t *len;
str = va_arg(args, char**);
- len = va_arg(args, int*);
+ len = va_arg(args, zend_size_t*);
/* the trivial way would be to do:
- * conver_to_string_ex(arg);
+ * convert_to_string_ex(arg);
* append it and kill the now tmp arg.
* but that could cause some E_NOTICE and also damn long lines.
*/