diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-03 22:53:05 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-03 22:53:05 -0700 |
| commit | 25d04ad8e3e4b415645f982178a274f7a36eeef6 (patch) | |
| tree | 9a6bf6839715f09d5b609f2e0cac986f143aa038 /ext/imap/php_imap.c | |
| parent | 0bc6592307af27c81ab1717cc589adb2530565ac (diff) | |
| parent | d858b4c77fa28ff9b0a597141a58f51803bafc2b (diff) | |
| download | php-git-25d04ad8e3e4b415645f982178a274f7a36eeef6.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add length check for bzcompress too - fix for bug #73356
More string length checks & fixes
More string length checks & fixes
Diffstat (limited to 'ext/imap/php_imap.c')
| -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 7b4d31143a..76edc78b22 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3950,7 +3950,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * #define PHP_IMAP_CLEAN if (bufferTo) efree(bufferTo); if (bufferCc) efree(bufferCc); if (bufferBcc) efree(bufferBcc); if (bufferHeader) efree(bufferHeader); #define PHP_IMAP_BAD_DEST PHP_IMAP_CLEAN; efree(tempMailTo); return (BAD_MSG_DESTINATION); - bufferHeader = (char *)emalloc(bufferLen + 1); + bufferHeader = (char *)safe_emalloc(bufferLen, 1, 1); memset(bufferHeader, 0, bufferLen); if (to && *to) { strlcat(bufferHeader, "To: ", bufferLen + 1); |