com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/cdf.h
| From: | Stanislav Malyshev | Date: | Tue, 29 Oct 2019 03:47:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/cdf.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109096@lists.php.net to get a copy of this message | ||
Commit: 8c2b3b056857a1d3c049f7adacf082a0941bfa62
Author: Stanislav Malyshev <stas@php.net> Mon, 28 Oct 2019 20:47:44 -0700
Parents: 736cd93ef53a458dbe5b86cab1f61721ccbc8b2d 2bdb13a1f776fccf89506d63eb71e950df96c21e
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8c2b3b056857a1d3c049f7adacf082a0941bfa62
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix libmagic buffer overflow issue (CVE-2019-18218)
bump version
set versions for release
Changed paths:
MM ext/fileinfo/libmagic/cdf.c
MM ext/fileinfo/libmagic/cdf.h
Diff: