From 4de127dc81624b43843bc4d3d31f97bffd992c93 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Jan 2020 11:44:20 +0100
Subject: mbstring:   Fix #79037 global buffer-overflow in
 mbfl_filt_conv_big5_wchar   CVE-2020-7060 standard:   Fix #79099 OOB read in
 php_strip_tags_ex   CVE-2020-7059

---
 php.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 4896ddb..d254dd9 100644
--- a/php.spec
+++ b/php.spec
@@ -146,7 +146,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: 5.6.40
-Release: 15%{?dist}
+Release: 16%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -232,6 +232,8 @@ Patch229: php-bug78862.patch
 Patch230: php-bug78863.patch
 Patch231: php-bug78793.patch
 Patch232: php-bug78910.patch
+Patch233: php-bug79099.patch
+Patch234: php-bug79037.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -986,6 +988,8 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch230 -p1 -b .bug78863
 %patch231 -p1 -b .bug78793
 %patch232 -p1 -b .bug78910
+%patch233 -p1 -b .bug79099
+%patch234 -p1 -b .bug79037
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1927,6 +1931,14 @@ EOF
 
 
 %changelog
+* Tue Jan 21 2020 Remi Collet <remi@remirepo.net> - 5.6.40-16
+- mbstring:
+  Fix #79037 global buffer-overflow in mbfl_filt_conv_big5_wchar
+  CVE-2020-7060
+- standard:
+  Fix #79099 OOB read in php_strip_tags_ex
+  CVE-2020-7059
+
 * Tue Dec 17 2019 Remi Collet <remi@remirepo.net> - 5.6.40-15
 - bcmath:
   Fix #78878 Buffer underflow in bc_shift_addsub
-- 
cgit