com php-src: fix signed/unsigned mismatch: Zend/zend_builtin _functions.c
| From: | Anatol Belski | Date: | Mon, 15 Sep 2014 10:58:44 +0000 |
| Subject: | com php-src: fix signed/unsigned mismatch: Zend/zend_builtin _functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81639@lists.php.net to get a copy of this message | ||
Commit: c8ed0d81e755c700f86cddb74f62eda27bc6e2de
Author: Anatol Belski <ab@php.net> Mon, 15 Sep 2014 12:08:42 +0200
Parents: 4e09d782efae9c22a81b9c46f0243c0d1e13771d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c8ed0d81e755c700f86cddb74f62eda27bc6e2de
Log:
fix signed/unsigned mismatch
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index f320585..0977b64 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -415,7 +415,7 @@ ZEND_FUNCTION(func_num_args)
Get the $arg_num'th argument that was passed to the function */
ZEND_FUNCTION(func_get_arg)
{
- int arg_count, first_extra_arg;
+ uint32_t arg_count, first_extra_arg;
zval *arg;
zend_long requested_offset;
zend_execute_data *ex;
@@ -460,8 +460,8 @@ ZEND_FUNCTION(func_get_arg)
ZEND_FUNCTION(func_get_args)
{
zval *p;
- int arg_count, first_extra_arg;
- int i;
+ uint32_t arg_count, first_extra_arg;
+ uint32_t i;
zend_execute_data *ex = EG(current_execute_data)->prev_execute_data;
if (ex->frame_kind != VM_FRAME_NESTED_FUNCTION && ex->frame_kind !=
VM_FRAME_TOP_FUNCTION) {
@@ -2104,15 +2104,15 @@ ZEND_FUNCTION(get_defined_constants)
static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array TSRMLS_DC)
{
- int num_args = call->num_args;
+ uint32_t num_args = call->num_args;
array_init_size(arg_array, num_args);
if (num_args) {
- int i = 0;
+ uint32_t i = 0;
zval *p = ZEND_CALL_ARG(call, 1);
if (call->func->type == ZEND_USER_FUNCTION) {
- int first_extra_arg = call->func->op_array.num_args;
+ uint32_t first_extra_arg = call->func->op_array.num_args;
if (call->func->op_array.fn_flags & ZEND_ACC_VARIADIC) {
first_extra_arg--;