]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:17 +0000 (09:50 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:17 +0000 (09:50 -0200)
commit048923b3c6bec8a7aed97015e8a3597ae1898b3d
tree7f731860a05ed01a21485e7a1989fa11b68fbab2
parentd23f089fb94b8a3fec07d58a6801fe078c32dd3e
parent8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Moved NULL check before dereferencing
ext/zip/php_zip.c