]> granicus.if.org Git - php/commitdiff
fix datatype mismatches
authorAnatol Belski <ab@php.net>
Fri, 24 Oct 2014 18:49:32 +0000 (20:49 +0200)
committerAnatol Belski <ab@php.net>
Fri, 24 Oct 2014 18:50:09 +0000 (20:50 +0200)
Zend/zend_execute_API.c

index a5da73c9f07acfa6a69ef3f8223a049607840451..5edc65e93eaff6996205dac7a54a3e9250b7bdac 100644 (file)
@@ -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));