Skip to content

Fixed bug #78563 - XML Parser Cloning / Extension #4778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fixed bug #78563 - XML Parser Cloning / Extension #4778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3f6d14
Fixes for bug 78563
marandall Oct 4, 2019
346c201
Add test for serializing
marandall Oct 4, 2019
9fc6820
Fix title for serializing
marandall Oct 4, 2019
675e24f
indentation
marandall Oct 5, 2019
1c06fa3
Applied slash-be-gone
marandall Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ext/xml/tests/bug78563.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--TEST--
Bug #78563: parsers should not be clonable
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
<?php

$parser = xml_parser_create();
clone $parser;

?>
===DONE===
--EXPECTF--
Fatal error: Uncaught Error: Trying to clone an uncloneable object of class XmlParser in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
15 changes: 15 additions & 0 deletions ext/xml/tests/bug78563_final.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--TEST--
Bug #78563: parsers should not be extendable
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
<?php

class Dummy extends Xmlparser {

}

?>
===DONE===
--EXPECTF--
Fatal error: Class Dummy may not inherit from final class (XmlParser) in %s on line %d
18 changes: 18 additions & 0 deletions ext/xml/tests/bug78563_serialize.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
Bug #78563: parsers should not be serializable
--SKIPIF--
<?php include("skipif.inc"); ?>
--FILE--
<?php

$parser = xml_parser_create();
serialize($parser);

?>
===DONE===
--EXPECTF--
Fatal error: Uncaught Exception: Serialization of 'XmlParser' is not allowed in %s:%d
Stack trace:
#0 %s(%d): serialize(Object(XmlParser))
#1 {main}
thrown in %s on line %d
8 changes: 6 additions & 2 deletions ext/xml/xml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "ext/standard/php_string.h"
#include "ext/standard/info.h"
#include "ext/standard/html.h"
#include "zend_interfaces.h"

#if HAVE_XML

Expand Down Expand Up @@ -308,15 +309,18 @@ PHP_MINIT_FUNCTION(xml)
{
zend_class_entry ce;
INIT_CLASS_ENTRY(ce, "XmlParser", xml_parser_methods);
ce.create_object = xml_parser_create_object;
ce.ce_flags |= ZEND_ACC_FINAL;
xml_parser_ce = zend_register_internal_class(&ce);
xml_parser_ce->create_object = xml_parser_create_object;
xml_parser_ce->ce_flags |= ZEND_ACC_FINAL;
xml_parser_ce->serialize = zend_class_serialize_deny;
xml_parser_ce->unserialize = zend_class_unserialize_deny;

memcpy(&xml_parser_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
xml_parser_object_handlers.offset = XtOffsetOf(xml_parser, std);
xml_parser_object_handlers.free_obj = xml_parser_free_obj;
xml_parser_object_handlers.get_gc = xml_parser_get_gc;
xml_parser_object_handlers.get_constructor = xml_parser_get_constructor;
xml_parser_object_handlers.clone_obj = NULL;

REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("XML_ERROR_NO_MEMORY", XML_ERROR_NO_MEMORY, CONST_CS|CONST_PERSISTENT);
Expand Down