com php-src: fix datatype mismatches: Zend/zend_execute_API .c
| From: | Anatol Belski | Date: | Fri, 24 Oct 2014 18:50:09 +0000 |
| Subject: | com php-src: fix datatype mismatches: Zend/zend_execute_API .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82634@lists.php.net to get a copy of this message | ||
Commit: 89ed34e3e940c07ae4cbe2df801bcdda0a114b79
Author: Anatol Belski <ab@php.net> Fri, 24 Oct 2014 20:49:32 +0200
Parents: 283947af74c59080c30131ada7249f64a73fff5e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=89ed34e3e940c07ae4cbe2df801bcdda0a114b79
Log:
fix datatype mismatches
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a5da73c..5edc65e 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -529,7 +529,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas
char *actual = Z_STRVAL_P(p);
if ((colon = (char*)zend_memrchr(Z_STRVAL_P(p), ':', Z_STRLEN_P(p)))) {
- int len;
+ size_t len;
zend_error(E_ERROR, "Undefined class constant '%s'", Z_STRVAL_P(p));
len = Z_STRLEN_P(p) - ((colon - Z_STRVAL_P(p)) + 1);
@@ -544,7 +544,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_bool inline_change, zend_clas
} else {
zend_string *save = Z_STR_P(p);
char *slash;
- int actual_len = Z_STRLEN_P(p);
+ size_t actual_len = Z_STRLEN_P(p);
if ((Z_CONST_FLAGS_P(p) & IS_CONSTANT_UNQUALIFIED) && (slash = (char
*)zend_memrchr(actual, '\\', actual_len))) {
actual = slash + 1;
actual_len -= (actual - Z_STRVAL_P(p));