packages: rpm/rpm-php-requires.php - avoid deadloops with preg_match
glen
glen at pld-linux.org
Wed Mar 10 22:47:23 CET 2010
Author: glen Date: Wed Mar 10 21:47:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- avoid deadloops with preg_match
---- Files affected:
packages/rpm:
rpm-php-requires.php (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/rpm/rpm-php-requires.php
diff -u packages/rpm/rpm-php-requires.php:1.15 packages/rpm/rpm-php-requires.php:1.16
--- packages/rpm/rpm-php-requires.php:1.15 Thu Feb 18 10:00:23 2010
+++ packages/rpm/rpm-php-requires.php Wed Mar 10 22:47:17 2010
@@ -43,7 +43,7 @@
continue;
}
- while (preg_match("/(\W|^)(require|include)(_once)?
+ if (preg_match("/(\W|^)(require|include)(_once)?
\s* \(? \s*
(\"([^\"]*)\"|'([^']*)')
\s* \)? \s* ;/x", $line, $m)) {
@@ -71,7 +71,7 @@
continue;
}
- while (preg_match("/(\W|^)(require|include)(_once)?
+ if (preg_match("/(\W|^)(require|include)(_once)?
\s* \(? \s* dirname \s* \( \s* __FILE__ \s* \) \s* \. \s*
(\"([^\"]*)\"|'([^']*)')
\s* \)? \s* ;/x", $line, $m)) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-php-requires.php?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list