diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-05 13:20:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-05 13:22:17 -0700 |
| commit | 669763d88a8bb9707a45f0937a129b63a161d2f0 (patch) | |
| tree | 88a1fc19403a330c9a50e7095ee0a8844445b993 /ext/standard/user_filters.c | |
| parent | d858b4c77fa28ff9b0a597141a58f51803bafc2b (diff) | |
| download | php-git-669763d88a8bb9707a45f0937a129b63a161d2f0.tar.gz | |
More int->size_t and string overflow fixes
Diffstat (limited to 'ext/standard/user_filters.c')
| -rw-r--r-- | ext/standard/user_filters.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index e65148a2df..2da03cd276 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -268,7 +268,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, zval obj, zfilter; zval func_name; zval retval; - int len; + size_t len; /* some sanity checks */ if (persistent) { @@ -277,7 +277,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, return NULL; } - len = (int)strlen(filtername); + len = strlen(filtername); /* determine the classname/class entry */ if (NULL == (fdat = zend_hash_str_find_ptr(BG(user_filter_map), (char*)filtername, len))) { @@ -289,7 +289,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, TODO: Allow failed userfilter creations to continue scanning through the list */ if ((period = strrchr(filtername, '.'))) { - char *wildcard = emalloc(len + 3); + char *wildcard = safe_emalloc(len, 1, 3); /* Search for wildcard matches instead */ memcpy(wildcard, filtername, len + 1); /* copy \0 */ @@ -452,7 +452,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) if (!bucket->own_buf) { bucket = php_stream_bucket_make_writeable(bucket); } - if ((int)bucket->buflen != Z_STRLEN_P(pzdata)) { + if (bucket->buflen != Z_STRLEN_P(pzdata)) { bucket->buf = perealloc(bucket->buf, Z_STRLEN_P(pzdata), bucket->is_persistent); bucket->buflen = Z_STRLEN_P(pzdata); } |