]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorStanislav Malyshev <stas@php.net>
Mon, 3 Dec 2018 08:42:50 +0000 (00:42 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 3 Dec 2018 08:42:50 +0000 (00:42 -0800)
* PHP-7.1:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail

1  2 
ext/imap/php_imap.c
ext/phar/phar.c

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