diff options
| author | Anatol Belski <ab@php.net> | 2016-09-13 11:51:17 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-13 11:51:17 +0200 |
| commit | 2088e3eb45ebed1b9eb0f6b3fe258820a0021e5f (patch) | |
| tree | 5569d61d17abce09a3cdc2176491851f917b4271 /ext/imap | |
| parent | 0dd2f072b1b9a579777f4a3aa026d5f9004b8fbe (diff) | |
| parent | c403b3029123aefe0919058b100e80c6bc4e1a6d (diff) | |
| download | php-git-2088e3eb45ebed1b9eb0f6b3fe258820a0021e5f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9
Diffstat (limited to 'ext/imap')
| -rw-r--r-- | ext/imap/php_imap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 9416a7e34d..7b4d31143a 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -2977,7 +2977,7 @@ PHP_FUNCTION(imap_utf7_encode) } /* allocate output buffer */ - out = zend_string_alloc(outlen, 0); + out = zend_string_safe_alloc(1, outlen, 0, 0); /* encode input string */ outp = (unsigned char*)ZSTR_VAL(out); |