]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 628c257 b05ff14)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Sun, 24 Sep 2017 09:24:23 +0000 (17:24 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 24 Sep 2017 09:24:23 +0000 (17:24 +0800)
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning

1  2 
Zend/zend_operators.c patch | diff1 | diff2 | blob | history
ext/spl/spl_dllist.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_operators.c
Simple merge
diff --cc ext/spl/spl_dllist.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.