diff options
| -rw-r--r-- | pear/OS/Guess.php | 2 | ||||
| -rw-r--r-- | pear/package-PEAR.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pear/OS/Guess.php b/pear/OS/Guess.php index 7cbd988af0..c6852fef25 100644 --- a/pear/OS/Guess.php +++ b/pear/OS/Guess.php @@ -167,7 +167,7 @@ class OS_Guess $cpp = popen("/usr/bin/cpp $tmpfile", "r"); $major = $minor = 0; while ($line = fgets($cpp, 1024)) { - if ($line{0} == '#') { + if ($line{0} == '#' || trim($line) == '') { continue; } if (list($major, $minor) = explode(' ', trim($line))) { diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml index 0881ed7d84..35b781ddcc 100644 --- a/pear/package-PEAR.xml +++ b/pear/package-PEAR.xml @@ -41,6 +41,8 @@ <date>2003-08-??</date> <state>stable</state> <notes> +* Fixed #25131 - OS_Guess warnings on empty lines from + popen("/usr/bin/cpp $tmpfile", "r"); * Fixed #25117 - MD5 checksum should be case-insensitive * Fixed static calls to PEAR error-handling methods in classes (Greg) * Added ability to use a static method callback for error-handling, and removed |