From 9d2fbf925a18e89edc24ab0bf60d1faf39ae2dc7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sat, 8 Dec 2018 13:18:54 +0100
Subject: Fix null pointer dereference in imap_mail CVE-2018-19935

---
 php.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 8c67a52..ad2f09a 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -187,6 +187,7 @@ Patch91: php-5.6.3-oci8conf.patch
 # Upstream fixes (100+)
 
 # Security fixes (200+)
+Patch200: php-imap.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -909,6 +910,7 @@ support for JavaScript Object Notation (JSON) to PHP.
 # upstream patches
 
 # security patches
+%patch200 -p1 -b .imap
 
 # Fixes for tests
 %patch300 -p1 -b .datetests
@@ -1849,6 +1851,9 @@ fi
 
 
 %changelog
+* Sat Dec  8 2018 Remi Collet <remi@remirepo.net> - 7.1.25-2
+- Fix null pointer dereference in imap_mail CVE-2018-19935
+
 * Wed Dec  5 2018 Remi Collet <remi@remirepo.net> - 7.1.25-1
 - Update to 7.1.25 - http://www.php.net/releases/7_1_25.php
 
-- 
cgit