nlopess Tue Jan 23 19:23:29 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/tidy tidy.c
Log:
fix a few crashes
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.20&r2=1.66.2.8.2.21&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.20
php-src/ext/tidy/tidy.c:1.66.2.8.2.21
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.20 Sat Jan 20 12:49:35 2007
+++ php-src/ext/tidy/tidy.c Tue Jan 23 19:23:29 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.20 2007/01/20 12:49:35 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.21 2007/01/23 19:23:29 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -515,7 +515,7 @@
tidyBufInit(&output);
tidySaveBuffer (doc, &output);
- RETVAL_STRINGL(output.bp, output.size-1, 1);
+ RETVAL_STRINGL(output.bp, output.size ?
output.size-1 : 0, 1);
tidyBufFree(&output);
} else {
RETVAL_FALSE;
@@ -683,7 +683,7 @@
obj = (PHPTidyObj *)zend_object_store_get_object(in
TSRMLS_CC);
tidyBufInit(&output);
tidySaveBuffer (obj->ptdoc->doc, &output);
- ZVAL_STRINGL(out, output.bp, output.size-1, TRUE);
+ ZVAL_STRINGL(out, output.bp, output.size ?
output.size-1 : 0, TRUE);
tidyBufFree(&output);
break;
@@ -990,7 +990,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.66.2.8.2.20 2007/01/20 12:49:35
nlopess Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.21 2007/01/23 19:23:29
nlopess Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1037,7 +1037,7 @@
tidyBufInit(&output);
tidySaveBuffer(doc, &output);
- RETVAL_STRINGL(output.bp, output.size-1, 1);
+ RETVAL_STRINGL(output.bp, output.size ? output.size-1 :
0, 1);
tidyBufFree(&output);
}
@@ -1103,7 +1103,7 @@
tidyBufInit(&output);
tidySaveBuffer(obj->ptdoc->doc, &output);
- RETVAL_STRINGL(output.bp, output.size-1, 1);
+ RETVAL_STRINGL(output.bp, output.size ? output.size-1 : 0, 1);
tidyBufFree(&output);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
