diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-27 17:31:29 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-27 17:31:29 +0200 |
| commit | c37beb7eb537b5033c88774142b2c40373f3bef8 (patch) | |
| tree | 80d5a628d7145387ab9fc6fbb492869884d3a828 /ext/xml/compat.c | |
| parent | 0d6490598dc2ab09ebd5cc28c4da6eb4eb11f98d (diff) | |
| parent | 829b0df77b20392115d75fb82c56ad94edc1e423 (diff) | |
| download | php-git-c37beb7eb537b5033c88774142b2c40373f3bef8.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #71592: External entity processing never fails
Diffstat (limited to 'ext/xml/compat.c')
| -rw-r--r-- | ext/xml/compat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 012e6b134b..e5db4469dc 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -359,7 +359,10 @@ _external_entity_ref_handler(void *user, const xmlChar *names, int type, const x return; } - parser->h_external_entity_ref(parser, names, (XML_Char *) "", sys_id, pub_id); + if (!parser->h_external_entity_ref(parser, names, (XML_Char *) "", sys_id, pub_id)) { + xmlStopParser(parser->parser); + parser->parser->errNo = XML_ERROR_EXTERNAL_ENTITY_HANDLING; + }; } static xmlEntityPtr |