Re: Re: cvs: php-src /ext/tidy tidy.c
| From: | Nuno Lopes | Date: | Fri, 16 Apr 2004 19:34:33 +0000 |
| Subject: | Re: Re: cvs: php-src /ext/tidy tidy.c | ||
| References: | 1 2 3 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-9271@lists.php.net to get a copy of this message | ||
>Should be fixed now.
>Derick
It isn't fixed because tidy tries to open NULL :)
Please apply my patch that (hoppefully) fixes the problem. (I've tested it!)
Nuno
Index: tidy.c =================================================================== RCS file: /repository/php-src/ext/tidy/tidy.c,v retrieving revision 1.45 diff -u -r1.45 tidy.c --- tidy.c 16 Apr 2004 18:55:19 -0000 1.45 +++ tidy.c 16 Apr 2004 19:31:23 -0000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.45 2004/04/16 18:55:19 derick Exp $ */ +/* $Id: tidy.c,v 1.44 2004/04/16 15:46:41 john Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1359,18 +1359,19 @@ } obj = (PHPTidyObj *)zend_object_store_get_object(object TSRMLS_CC); - - if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) { - TIDY_THROW("Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); - return; - } - TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); + if (inputfile) { + if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) { + TIDY_THROW("Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + return; + } - php_tidy_parse_string(obj, contents, enc TSRMLS_CC); - - efree(contents); + TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); + php_tidy_parse_string(obj, contents, enc TSRMLS_CC); + + efree(contents); + } } TIDY_DOC_METHOD(parseFile)
Index: tidy.c =================================================================== RCS file: /repository/php-src/ext/tidy/tidy.c,v retrieving revision 1.45 diff -u -r1.45 tidy.c --- tidy.c 16 Apr 2004 18:55:19 -0000 1.45 +++ tidy.c 16 Apr 2004 19:31:23 -0000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.45 2004/04/16 18:55:19 derick Exp $ */ +/* $Id: tidy.c,v 1.44 2004/04/16 15:46:41 john Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1359,18 +1359,19 @@ } obj = (PHPTidyObj *)zend_object_store_get_object(object TSRMLS_CC); - - if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) { - TIDY_THROW("Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); - return; - } - TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); + if (inputfile) { + if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) { + TIDY_THROW("Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); + return; + } - php_tidy_parse_string(obj, contents, enc TSRMLS_CC); - - efree(contents); + TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); + php_tidy_parse_string(obj, contents, enc TSRMLS_CC); + + efree(contents); + } } TIDY_DOC_METHOD(parseFile)