iliaa Thu Jun 24 10:20:59 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
MFB: Fixed bug #1713 (possible crash inside tidy_get_error_buffer()).
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.54&r2=1.55&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.54 php-src/ext/tidy/tidy.c:1.55
--- php-src/ext/tidy/tidy.c:1.54 Tue Jun 8 10:55:14 2004
+++ php-src/ext/tidy/tidy.c Thu Jun 24 10:20:59 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.54 2004/06/08 14:55:14 iliaa Exp $ */
+/* $Id: tidy.c,v 1.55 2004/06/24 14:20:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -952,7 +952,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.54 2004/06/08 14:55:14 iliaa Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.55 2004/06/24 14:20:59 iliaa Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1042,7 +1042,11 @@
{
TIDY_FETCH_OBJECT;
- RETURN_STRING(obj->ptdoc->errbuf->bp, 1);
+ if (obj->ptdoc->errbuf && obj->ptdoc->errbuf->bp) {
+ RETURN_STRING(obj->ptdoc->errbuf->bp, 1);
+ } else {
+ RETURN_FALSE;
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
