cvs: pear /PhpDocumentor/phpDocumentor ParserDescCleanup.inc
| From: | Greg Beaver | Date: | Thu, 15 Dec 2005 04:26:30 +0000 |
| Subject: | cvs: pear /PhpDocumentor/phpDocumentor ParserDescCleanup.inc | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-36874@lists.php.net to get a copy of this message | ||
cellog Thu Dec 15 04:26:30 2005 EDT
Modified files:
/pear/PhpDocumentor/phpDocumentor ParserDescCleanup.inc
Log:
dangerous PHP behavior ('01' == '1.') can cause an
infinite loop, so fix this
http://cvs.php.net/viewcvs.cgi/pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc?r1=1.1&r2=1.2&diff_format=u
Index: pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc
diff -u pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc:1.1
pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc:1.2
--- pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc:1.1 Mon Oct 17 18:36:57 2005
+++ pear/PhpDocumentor/phpDocumentor/ParserDescCleanup.inc Thu Dec 15 04:26:30 2005
@@ -1161,7 +1161,7 @@
if ((strlen($ltrimword) != strlen($word))
&& strlen($ltrimword) > 1
&&
((in_array($ltrimword{0},array('o','-','1','0','#','+'))
&& $ltrimword{1} == ' '))
- || ((strlen($ltrimword) >= 2) &&
(in_array(substr($ltrimword,0,2),array('1.','0.')) && $ltrimword{2} ==
' ')))
+ || ((strlen($ltrimword) >= 2) && (substr($ltrimword,0,2) ===
'1.' || substr($ltrimword,0,2) === '0.') && $ltrimword{2} == '
'))
{
// save the whitespace for comparison
$this->p_vars['whitespace'] = substr($word,0,strlen($word) -
strlen($ltrimword));