]> granicus.if.org Git - php/commitdiff
Fix bug #73150: missing NULL check in dom_document_save_html
authorStanislav Malyshev <stas@php.net>
Mon, 26 Sep 2016 04:25:01 +0000 (21:25 -0700)
committerAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 23:40:12 +0000 (01:40 +0200)
(cherry picked from commit 1c0e9126fbfb7fde3173347b7464237f56c38bfa)
(cherry picked from commit d1e878f2726e65502fdd992c5b57feeada57893f)

ext/dom/document.c

index 70289cf54a003136c7374d23c0e98d386dcc3252..a5e119f786589008c54dc1c9e6e5fbc04bc87717 100644 (file)
@@ -1663,7 +1663,7 @@ PHP_FUNCTION(dom_document_savexml)
                if (options & LIBXML_SAVE_NOEMPTYTAG) {
                        xmlSaveNoEmptyTags = saveempty;
                }
-               if (!size) {
+               if (!size || !mem) {
                        RETURN_FALSE;
                }
                RETVAL_STRINGL((char *) mem, size);
@@ -2215,7 +2215,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);