cvs: php-src /ext/tidy tidy.c /ext/tidy/tests 027.phpt

From: Date: Tue, 23 Jan 2007 19:50:14 +0000
Subject: cvs: php-src /ext/tidy tidy.c /ext/tidy/tests 027.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42865@lists.php.net to get a copy of this message
nlopess Tue Jan 23 19:50:14 2007 UTC Modified files: /php-src/ext/tidy tidy.c /php-src/ext/tidy/tests 027.phpt Log: MFB: fix a few crashes http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.110&r2=1.111&diff_format=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.110 php-src/ext/tidy/tidy.c:1.111 --- php-src/ext/tidy/tidy.c:1.110 Sat Jan 20 12:58:20 2007 +++ php-src/ext/tidy/tidy.c Tue Jan 23 19:50:14 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.110 2007/01/20 12:58:20 nlopess Exp $ */ +/* $Id: tidy.c,v 1.111 2007/01/23 19:50:14 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,7 +42,7 @@ /* {{{ ext/tidy macros */ -#define FIX_BUFFER(bptr) (bptr)->bp[(bptr)->size-1] = '\0' +#define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0) #define TIDY_SET_CONTEXT \ zval *object = getThis(); @@ -526,7 +526,7 @@ tidySaveBuffer (doc, &output); FIX_BUFFER(&output); - RETVAL_STRINGL((char *) output.bp, output.size-1, 1); + RETVAL_STRINGL((char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } else { RETVAL_FALSE; @@ -690,14 +690,14 @@ obj = (PHPTidyObj *)zend_object_store_get_object(in TSRMLS_CC); tidyBufInit(&output); tidySaveBuffer (obj->ptdoc->doc, &output); - ZVAL_STRINGL(out, (char *) output.bp, output.size, 1); + ZVAL_STRINGL(out, (char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); break; case IS_UNICODE: obj = (PHPTidyObj *)zend_object_store_get_object(in TSRMLS_CC); tidySaveBuffer (obj->ptdoc->doc, &output); - ZVAL_U_STRINGL(obj->converter->conv, out, (char *) output.bp, output.size, 1); + ZVAL_U_STRINGL(obj->converter->conv, out, (char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); break; @@ -765,9 +765,9 @@ if (output.size) { MAKE_STD_ZVAL(temp); if (UG(unicode)) { - ZVAL_U_STRINGL(obj->converter->conv, temp, (char *) output.bp, output.size, 1); + ZVAL_U_STRINGL(obj->converter->conv, temp, (char *) output.bp, output.size-1, 1); } else { - ZVAL_STRINGL(temp, (char *) output.bp, output.size, 1); + ZVAL_STRINGL(temp, (char *) output.bp, output.size-1, 1); } zend_ascii_hash_update(obj->std.properties, "value", sizeof("value"), (void *)&temp, sizeof(zval *), NULL); } @@ -1048,7 +1048,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.110 2007/01/20 12:58:20 nlopess Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.111 2007/01/23 19:50:14 nlopess Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1148,7 +1148,7 @@ tidySaveBuffer(doc, &outbuf); FIX_BUFFER(&outbuf); output_context->out.data = (char *) outbuf.bp; - output_context->out.used = outbuf.size - 1; + output_context->out.used = outbuf.size ? outbuf.size-1 : 0; output_context->out.free = 1; status = SUCCESS; } @@ -1224,7 +1224,7 @@ tidyBufInit(&output); tidySaveBuffer(obj->ptdoc->doc, &output); FIX_BUFFER(&output); - RETVAL_U_STRINGL(obj->converter->conv, (char *) output.bp, output.size-1, 1); + RETVAL_U_STRINGL(obj->converter->conv, (char *) output.bp, output.size ? output.size-1 : 0, 1); tidyBufFree(&output); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/027.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/tidy/tests/027.phpt diff -u /dev/null php-src/ext/tidy/tests/027.phpt:1.2 --- /dev/null Tue Jan 23 19:50:14 2007 +++ php-src/ext/tidy/tests/027.phpt Tue Jan 23 19:50:14 2007 @@ -0,0 +1,59 @@ +--TEST-- +Bug: tidy segfaults with markup=false +--SKIPIF-- +<?php if (!extension_loaded('tidy')) die('skip'); ?> +--FILE-- +<?php + +// bug report from http://sf.net/tracker/?func=detail&atid=390963&aid=1641868&group_id=27659 + +abstract class BaseClass { + private static $tidyconfig; + + public function BaseClass() { + $this->tidyconfig = array( + 'indent' => false, + 'clean' => true, + 'merge-divs' => false, + 'quote-marks' => true, + 'drop-empty-paras' => false, + 'markup' => false, + 'output-xhtml' => true, + 'wrap' => 0); + + } + + abstract public function run(); + + public function getURL($url) { + $data = "awerawer"; // in my code, $data is downloaded from a site + + $tidy = new tidy; + $tidy->parseString($data, $this->tidyconfig, 'utf8'); + $tidy->cleanRepair(); + + return $tidy; + } + +} + +class ChildClass extends BaseClass { + public function ChildClass() { + parent::__construct(); + } + + public function run() { + $result = $this->getURL('awer'); + if ($result === null) { + echo "\tError:\n"; + } + var_dump((string)$result); + } +} + +$instance = new ChildClass(); +$instance->run(); + +?> +--EXPECT-- +string(0) ""

« previous php.cvs (#42865) next »