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-imap.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 php.spec       |  7 +++++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 php-imap.patch

diff --git a/php-imap.patch b/php-imap.patch
new file mode 100644
index 0000000..c726a3a
--- /dev/null
+++ b/php-imap.patch
@@ -0,0 +1,70 @@
+From d8765852e0400ee2ce8ae9e2177c42731d4539d8 Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas@php.net>
+Date: Wed, 28 Nov 2018 15:45:51 -0800
+Subject: [PATCH] Add DISPLAY_INI_ENTRIES for imap
+
+---
+ ext/imap/php_imap.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
+index f6feebe9f769..a23e84c08521 100644
+--- a/ext/imap/php_imap.c
++++ b/ext/imap/php_imap.c
+@@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap)
+ 	php_info_print_table_row(2, "Kerberos Support", "enabled");
+ #endif
+ 	php_info_print_table_end();
++
++	DISPLAY_INI_ENTRIES();
+ }
+ /* }}} */
+ 
+From 7edc639b9ff1c3576773d79d016abbeed1f93846 Mon Sep 17 00:00:00 2001
+From: Stanislav Malyshev <stas@php.net>
+Date: Sun, 11 Nov 2018 10:04:01 -0800
+Subject: [PATCH] Fix #77020: null pointer dereference in imap_mail
+
+If an empty $message is passed to imap_mail(), we must not set message
+to NULL, since _php_imap_mail() is not supposed to handle NULL pointers
+(opposed to pointers to NUL).
+---
+ NEWS                         |  1 +
+ ext/imap/php_imap.c          |  1 -
+ ext/imap/tests/bug77020.phpt | 15 +++++++++++++++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 ext/imap/tests/bug77020.phpt
+
+diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
+index a23e84c08521..b30440f000f3 100644
+--- a/ext/imap/php_imap.c
++++ b/ext/imap/php_imap.c
+@@ -4128,7 +4128,6 @@ PHP_FUNCTION(imap_mail)
+ 	if (!ZSTR_LEN(message)) {
+ 		/* this is not really an error, so it is allowed. */
+ 		php_error_docref(NULL, E_WARNING, "No message string in mail command");
+-		message = NULL;
+ 	}
+ 
+ 	if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL,
+diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt
+new file mode 100644
+index 000000000000..8a65232eec6d
+--- /dev/null
++++ b/ext/imap/tests/bug77020.phpt
+@@ -0,0 +1,15 @@
++--TEST--
++Bug #77020 (null pointer dereference in imap_mail)
++--SKIPIF--
++<?php
++if (!extension_loaded('imap')) die('skip imap extension not available');
++?>
++--FILE--
++<?php
++imap_mail('1', 1, NULL);
++?>
++===DONE===
++--EXPECTF--
++Warning: imap_mail(): No message string in mail command in %s on line %d
++%s
++===DONE===
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