From 9a7a1fdabb5dd6aca6db15f879b9ec7c9b20075e Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Tue, 15 Nov 2011 15:16:20 +0000
Subject: [PATCH] - Fixed bug #54682 (Tidy::diagnose() NULL pointer
 dereference)

---
 ext/tidy/tests/bug54682.phpt | 13 +++++++++++++
 ext/tidy/tidy.c              |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 ext/tidy/tests/bug54682.phpt

diff --git a/ext/tidy/tests/bug54682.phpt b/ext/tidy/tests/bug54682.phpt
new file mode 100644
index 0000000000..99f40cf9d2
--- /dev/null
+++ b/ext/tidy/tests/bug54682.phpt
@@ -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
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 1ba910c957..d06bbcdb2e 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1336,7 +1336,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;
 	}
-- 
2.50.1