diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-20 02:06:02 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-20 02:06:02 +0000 |
| commit | c776a7bce1b89e0315939f8607b91e793b6ccb67 (patch) | |
| tree | bb63328cf0d516adcf06a6eb52ebc7d50b215db5 /user/php7/CVE-2018-19935.patch | |
| parent | 34a8b8725db414e6f51b35a6c248d4c67f53c154 (diff) | |
| parent | 333e6c234387f048557fdd4235c5a1809474f6f2 (diff) | |
| download | packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.gz packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.bz2 packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.tar.xz packages-c776a7bce1b89e0315939f8607b91e793b6ccb67.zip | |
Merge branch 'php7' into 'master'
user/php7: bump to 7.2.16, modernize, build with enchant-2
* Drop CVE-2018-19935.patch: included as of version 7.2.14
See merge request !204
Diffstat (limited to 'user/php7/CVE-2018-19935.patch')
| -rw-r--r-- | user/php7/CVE-2018-19935.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/user/php7/CVE-2018-19935.patch b/user/php7/CVE-2018-19935.patch deleted file mode 100644 index e24310f42..000000000 --- a/user/php7/CVE-2018-19935.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 648fc1e369fc05fb9200a42c7938912236b2a318 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). - -(cherry picked from commit 7edc639b9ff1c3576773d79d016abbeed1f93846) ---- - ext/imap/php_imap.c | 1 - - ext/imap/tests/bug77020.phpt | 15 +++++++++++++++ - 2 files changed, 15 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 9e626a4..01d1a5f 100644 ---- a/ext/imap/php_imap.c -+++ b/ext/imap/php_imap.c -@@ -4116,7 +4116,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 0000000..8a65232 ---- /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=== --- -2.1.4 - |