]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed7ab76 59c2477)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:22:06 +0000 (17:22 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:22:06 +0000 (17:22 -0700)
* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c

1  2 
ext/fileinfo/libmagic/cdf.c patch | diff1 | diff2 | blob | history

diff --cc ext/fileinfo/libmagic/cdf.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.