[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/tidy/ tidy.c
nlopess Mon, 23 Jan 2012 09:22:38 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=322614
Log:
minor tweak to warning to fix the bug54682.phpt test
Bug: https://bugs.php.net/54682 (Re-Opened) tidy NullPD
Changed paths:
U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2012-01-23 09:09:05 UTC
(rev 322613)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2012-01-23 09:22:38 UTC
(rev 322614)
@@ -1235,7 +1235,7 @@
obj = (PHPTidyObj *) zend_object_store_get_object(return_value
TSRMLS_CC);
if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path,
contents_len TSRMLS_CC))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot Load '%s'
into memory %s, inputfile, (use_include_path) ? (Using include path) : );
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot Load '%s'
into memory%s, inputfile, (use_include_path) ? (Using include path) : );
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/tidy/tidy.c trunk/ext/tidy/tidy.c
On Mon, Apr 25, 2011 at 9:46 AM, Hannes Magnusson
hannes.magnus...@gmail.com wrote:
On Mon, Apr 25, 2011 at 00:08, Pierre Joye paj...@php.net wrote:
pajoye Sun, 24 Apr 2011 22:08:11 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310457
Log:
- fix use of unitiliazed var
Changed paths:
U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c 2011-04-24 20:47:22
UTC (rev 310456)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c 2011-04-24 22:08:11
UTC (rev 310457)
@@ -985,10 +985,10 @@
case is_body_node:
node = tidyGetBody(obj-ptdoc-doc);
break;
- }
- if (!node) {
- RETURN_NULL();
+ default:
+ RETURN_NULL();
+ break;
What happens if those functions actually fail?
There is no functional change here, only that inode is now used only
if initialized. The behavior of this code when this function returns
NULL remains the same.
Cheers,
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/tidy/tidy.c trunk/ext/tidy/tidy.c
pajoye Mon, 25 Apr 2011 09:28:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310466
Log:
- keep inode creation check
Changed paths:
U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-25 07:50:07 UTC
(rev 310465)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-25 09:28:08 UTC
(rev 310466)
@@ -991,6 +991,10 @@
break;
}
+ if (!inode) {
+ RETURN_NULL();
+ }
+
tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
newobj = (PHPTidyObj *) zend_object_store_get_object(return_value
TSRMLS_CC);
newobj-type = is_node;
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2011-04-25 07:50:07 UTC (rev 310465)
+++ php/php-src/trunk/ext/tidy/tidy.c 2011-04-25 09:28:08 UTC (rev 310466)
@@ -987,6 +987,10 @@
break;
}
+ if (!inode) {
+ RETURN_NULL();
+ }
+
tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
newobj = (PHPTidyObj *) zend_object_store_get_object(return_value
TSRMLS_CC);
newobj-type = is_node;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/tidy/tidy.c trunk/ext/tidy/tidy.c
pajoye Mon, 25 Apr 2011 09:31:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310467
Log:
- keep node creation check
Changed paths:
U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-25 09:28:08 UTC
(rev 310466)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-25 09:31:00 UTC
(rev 310467)
@@ -991,7 +991,7 @@
break;
}
- if (!inode) {
+ if (!node) {
RETURN_NULL();
}
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2011-04-25 09:28:08 UTC (rev 310466)
+++ php/php-src/trunk/ext/tidy/tidy.c 2011-04-25 09:31:00 UTC (rev 310467)
@@ -987,7 +987,7 @@
break;
}
- if (!inode) {
+ if (!node) {
RETURN_NULL();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/tidy/tidy.c trunk/ext/tidy/tidy.c
pajoye Sun, 24 Apr 2011 22:08:11 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=310457
Log:
- fix use of unitiliazed var
Changed paths:
U php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
U php/php-src/trunk/ext/tidy/tidy.c
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tidy.c
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-24 20:47:22 UTC
(rev 310456)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tidy.c2011-04-24 22:08:11 UTC
(rev 310457)
@@ -985,10 +985,10 @@
case is_body_node:
node = tidyGetBody(obj-ptdoc-doc);
break;
- }
- if (!node) {
- RETURN_NULL();
+ default:
+ RETURN_NULL();
+ break;
}
tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
Modified: php/php-src/trunk/ext/tidy/tidy.c
===
--- php/php-src/trunk/ext/tidy/tidy.c 2011-04-24 20:47:22 UTC (rev 310456)
+++ php/php-src/trunk/ext/tidy/tidy.c 2011-04-24 22:08:11 UTC (rev 310457)
@@ -981,10 +981,10 @@
case is_body_node:
node = tidyGetBody(obj-ptdoc-doc);
break;
- }
- if (!node) {
- RETURN_NULL();
+ default:
+ RETURN_NULL();
+ break;
}
tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
