]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:04:36 +0000 (09:04 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:04:36 +0000 (09:04 -0200)
* PHP-5.5:
  - Fixed possible NULL ptr dereference

1  2 
ext/phar/util.c

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