cvs: php-src /ext/tidy tidy.c
| From: | Ilia Alshanetsky | Date: | Sun, 23 May 2004 17:22:22 +0000 |
| Subject: | cvs: php-src /ext/tidy tidy.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27427@lists.php.net to get a copy of this message | ||
iliaa Sun May 23 13:22:22 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
Fixed leaks on fatal errors in tidy.
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.51 php-src/ext/tidy/tidy.c:1.52
--- php-src/ext/tidy/tidy.c:1.51 Tue May 11 11:59:07 2004
+++ php-src/ext/tidy/tidy.c Sun May 23 13:22:21 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.51 2004/05/11 15:59:07 iliaa Exp $ */
+/* $Id: tidy.c,v 1.52 2004/05/23 17:22:21 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -403,6 +403,9 @@
tidyBufInit(errbuf);
if (tidySetErrorBuffer(doc, errbuf) != 0) {
+ tidyBufFree(errbuf);
+ efree(errbuf);
+ tidyRelease(doc);
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not set Tidy error buffer");
}
@@ -524,6 +527,11 @@
tidyBufInit(intern->ptdoc->errbuf);
if (tidySetErrorBuffer(intern->ptdoc->doc, intern->ptdoc->errbuf) != 0) {
+ tidyBufFree(intern->ptdoc->errbuf);
+ efree(intern->ptdoc->errbuf);
+ tidyRelease(intern->ptdoc->doc);
+ efree(intern->ptdoc);
+ efree(intern);
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not set Tidy error buffer");
}
@@ -931,7 +939,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.51 2004/05/11 15:59:07 iliaa Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id:
tidy.c,v 1.52 2004/05/23 17:22:21 iliaa Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();