Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail

diff --cc ext/imap/php_imap.c
index 33a68a7a18a94b3083781fb7988992994e7d7c53,b30440f000f38f1e040a909a290db754ace49042..011cbc0dfdd69b934c525f296236f10f481a0500
--- 1/ext/imap/php_imap.c
--- 2/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@@ -4125,14 -4091,12 +4125,13 @@@ PHP_FUNCTION(imap_mail
        }
  
        /* message body */
 -      if (!message_len) {
 +      if (!ZSTR_LEN(message)) {
                /* this is not really an error, so it is allowed. */
 -              php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message string in mail command");
 +              php_error_docref(NULL, E_WARNING, "No message string in mail command");
-               message = NULL;
        }
  
 -      if (_php_imap_mail(to, subject, message, headers, cc, bcc, rpath TSRMLS_CC)) {
 +      if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL,
 +                      bcc?ZSTR_VAL(bcc):NULL, rpath?ZSTR_VAL(rpath):NULL)) {
                RETURN_TRUE;
        } else {
                RETURN_FALSE;

diff --cc ext/phar/phar.c
Simple merge