diff options
| author | Anatol Belski <ab@php.net> | 2016-11-08 11:13:29 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-08 11:13:29 +0100 |
| commit | 2b30b542750a917932fed29cafac83d40a045ffe (patch) | |
| tree | 93730bf6b1787772a50d3ac9d2ff96674e697a24 /ext/imap | |
| parent | 5faaf76bd51818fb5954a12643a2de8f76120fcd (diff) | |
| parent | de643586dee986ff16c0a6be44813687786aa781 (diff) | |
| download | php-git-2b30b542750a917932fed29cafac83d40a045ffe.tar.gz | |
Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0
* phpsec/PHP-7.0.13:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696: imagefilltoborder stackoverflow on truecolor images
Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
remove unreferenced var came in with merge
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
fix version
set versions
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 a8eae27b0e..8ac5ed4150 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -3934,7 +3934,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char * char *tsm_errmsg = NULL; ADDRESS *addr; char *bufferTo = NULL, *bufferCc = NULL, *bufferBcc = NULL, *bufferHeader = NULL; - int offset, bufferLen = 0; + size_t offset, bufferLen = 0; size_t bt_len; if (headers) { |