archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference)

Browse source
This commit is contained in:
Felipe Pena 2011-11-15 15:16:20 +00:00
parent 7cac52f58f
commit bb6835f727
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -27,6 +27,10 @@ PHP NEWS
- SOAP
. Fixed bug #44686 (SOAP-ERROR: Parsing WSDL with references). (Dmitry)
- Tidy:
. Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference).
(Maksymilian Arciemowicz, Felipe)
03 Nov 2011, PHP 5.3.9RC1

13
ext/tidy/tests/bug54682.phpt Normal file
View file

@ -0,0 +1,13 @@
--TEST--
Tidy::diagnose() NULL pointer dereference
--SKIPIF--
<?php if (!extension_loaded("tidy")) print "skip"; ?>
--FILE--
<?php
$nx = new Tidy("*");
$nx->diagnose();
?>
--EXPECTF--
Warning: tidy::__construct(): Cannot Load '*' into memory in %s on line %d

2
ext/tidy/tidy.c
View file

@ -1288,7 +1288,7 @@ static PHP_FUNCTION(tidy_diagnose)
{
TIDY_FETCH_OBJECT;
if (tidyRunDiagnostics(obj->ptdoc->doc) >= 0) {
if (tidyStatus(obj->ptdoc->doc) != 0 && tidyRunDiagnostics(obj->ptdoc->doc) >= 0) {
tidy_doc_update_properties(obj TSRMLS_CC);
RETURN_TRUE;
}