com php-src: fix "comparing size_t to <0" warning : ext/standard/string.c
| From: | Stanislav Malyshev | Date: | Mon, 29 Dec 2014 07:46:28 +0000 |
| Subject: | com php-src: fix "comparing size_t to <0" warning : ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83912@lists.php.net to get a copy of this message | ||
Commit: b9466213338660a7ccb3ec35c5dbd60c59b39f4e
Author: Stanislav Malyshev <stas@php.net> Sun, 28 Dec 2014 23:46:28 -0800
Parents: 983fdb25ea1030a76bcd56872cb2ab1b59ac527b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b9466213338660a7ccb3ec35c5dbd60c59b39f4e
Log:
fix "comparing size_t to <0" warning
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 477032d..c57885f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5385,6 +5385,7 @@ PHP_FUNCTION(money_format)
double value;
zend_bool check = 0;
zend_string *str;
+ ssize_t res_len;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sd", &format, &format_len,
&value) == FAILURE) {
return;
@@ -5405,10 +5406,11 @@ PHP_FUNCTION(money_format)
}
str = zend_string_alloc(format_len + 1024, 0);
- if ((str->len = strfmon(str->val, str->len, format, value)) < 0) {
+ if ((res_len = strfmon(str->val, str->len, format, value)) < 0) {
zend_string_free(str);
RETURN_FALSE;
}
+ str->len = (size_t)res_len;
str->val[str->len] = '\0';
RETURN_NEW_STR(zend_string_realloc(str, str->len, 0));