]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 736cd93 2bdb13a)
Merge branch 'PHP-7.2' into PHP-7.3
authorStanislav Malyshev <stas@php.net>
Tue, 29 Oct 2019 03:47:44 +0000 (20:47 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 29 Oct 2019 03:47:44 +0000 (20:47 -0700)
* PHP-7.2:
  Fix libmagic buffer overflow issue (CVE-2019-18218)
  bump version
  set versions for release

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

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