diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-10-15 10:17:16 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-10-15 10:17:16 +0200 |
| commit | bec6bca2de5aaf1a1b186722901dc75ec1529fea (patch) | |
| tree | 1c6c37099f22c30b3999754d8adbe0bfba02ba8c /bug73150.patch | |
| parent | b52e0db9c0cf11f6eda1e00f2d5292a0ac78424c (diff) | |
PHP 5.5.38 with 15 security fix from 5.6.27
Diffstat (limited to 'bug73150.patch')
| -rw-r--r-- | bug73150.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/bug73150.patch b/bug73150.patch new file mode 100644 index 0000000..0482167 --- /dev/null +++ b/bug73150.patch @@ -0,0 +1,37 @@ +Backported from 5.6.27 by Remi. + + +From 1c0e9126fbfb7fde3173347b7464237f56c38bfa Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev <stas@php.net> +Date: Sun, 25 Sep 2016 21:25:01 -0700 +Subject: [PATCH] Fix bug #73150: missing NULL check in dom_document_save_html + +--- + ext/dom/document.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/dom/document.c b/ext/dom/document.c +index d33aaf1..1970c38 100644 +--- a/ext/dom/document.c ++++ b/ext/dom/document.c +@@ -1853,7 +1853,7 @@ PHP_FUNCTION(dom_document_savexml) + if (options & LIBXML_SAVE_NOEMPTYTAG) { + xmlSaveNoEmptyTags = saveempty; + } +- if (!size) { ++ if (!size || !mem) { + RETURN_FALSE; + } + RETVAL_STRINGL(mem, size, 1); +@@ -2388,7 +2388,7 @@ PHP_FUNCTION(dom_document_save_html) + #else + htmlDocDumpMemory(docp, &mem, &size); + #endif +- if (!size) { ++ if (!size || !mem) { + RETVAL_FALSE; + } else { + RETVAL_STRINGL((const char*) mem, size, 1); +-- +2.1.4 + |