diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-02-12 18:56:11 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-02-12 18:56:11 +0800 |
| commit | 6649aebb894aa38af2ad04d8a20ec379cc19f4cc (patch) | |
| tree | 057f9125d2f5829b0b4fdbdf527ae4a9642f9ef1 | |
| parent | 479d7c3f4d472510841d71fc86136e1a968e3e86 (diff) | |
| parent | ee25eb0eae52a942c914b997c14d9558be76ee88 (diff) | |
| download | php-git-6649aebb894aa38af2ad04d8a20ec379cc19f4cc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #73496 (Invalid memory access in zend_inline_hash_func)
| -rw-r--r-- | main/streams/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/filter.c b/main/streams/filter.c index 6c3cdb0e4d..6d38869556 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -263,7 +263,7 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval /* try a wildcard */ char *wildname; - wildname = emalloc(n+3); + wildname = safe_emalloc(1, n, 3); memcpy(wildname, filtername, n+1); period = wildname + (period - filtername); while (period && !filter) { |