summaryrefslogtreecommitdiff
path: root/Zend/zend_string.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-15 15:51:40 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-15 15:51:40 +0400
commit8217e20ddb16303ca75cd61d9176e41e3b35edb3 (patch)
tree458dc80183204a835e5b225a342c45fc0cb8d4a4 /Zend/zend_string.h
parentb4c2bd227743e4ab9d47bf624911b230b3237b51 (diff)
downloadphp-git-8217e20ddb16303ca75cd61d9176e41e3b35edb3.tar.gz
Fixed compilation warnings
Diffstat (limited to 'Zend/zend_string.h')
-rw-r--r--Zend/zend_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index e1780d71fc..ef0116b938 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -194,14 +194,14 @@ static zend_always_inline zend_string *zend_str_safe_realloc(zend_string *s, siz
if (IS_INTERNED(s)) {
ret = STR_SAFE_ALLOC(n, m, l, persistent);
- memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
+ memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
} else if (STR_REFCOUNT(s) == 1) {
ret = (zend_string *)safe_perealloc(s, n, m, ZEND_MM_ALIGNED_SIZE(_STR_HEADER_SIZE + l + 1), persistent);
ret->len = (n * m) + l;
STR_FORGET_HASH_VAL(ret);
} else {
ret = STR_SAFE_ALLOC(n, m, l, persistent);
- memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
+ memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
STR_DELREF(s);
}
return ret;