diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-03 20:45:13 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-03 20:46:25 -0700 |
| commit | 6e12e49b5be06b4346e3d7802ea9b09f9f1abd7b (patch) | |
| tree | 4f1594c43a95c5ddd99b28098d60241bd4fff9bd /ext/imap/php_imap.c | |
| parent | 7f2b7a4950bf30e6a13e89456275f53e5b66eb1f (diff) | |
| parent | ea9fac94bbae150a81fde0e6542e6b45965772cd (diff) | |
| download | php-git-6e12e49b5be06b4346e3d7802ea9b09f9f1abd7b.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
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 566392fbfd..a8eae27b0e 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); |