Fixed bug #71806

10 years ago · 02743f43c2
4 changed files with 19 additions and 0 deletions
--- a/2
+++ b/2
@ -25,6 +25,8 @@ PHP                                                                        NEWS
  . Fixed bug #71724 (yield from does not count EOLs). (Nikita)
  . Fixed bug #71767 (ReflectionMethod::getDocComment returns the wrong
    comment). (Grigorii Sokolik)
+  . Fixed bug #71806 (php_strip_whitespace() fails on some numerical values).
+    (Nikita)

 - Curl:
  . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@ -228,6 +228,9 @@ ZEND_API void zend_strip(void)
 		prev_space = 0;
 		ZVAL_UNDEF(&token);
 	}
+
+	/* Discard parse errors thrown during tokenization */
+	zend_clear_exception();
 }

 /*
--- a/ext/standard/tests/strings/bug71806.dat
+++ b/ext/standard/tests/strings/bug71806.dat
@ -0,0 +1,3 @@
+<?php
+/* comment */
+echo   098   ;
--- a/ext/standard/tests/strings/bug71806.phpt
+++ b/ext/standard/tests/strings/bug71806.phpt
@ -0,0 +1,11 @@
+--TEST--
+Bug #71806 (php_strip_whitespace() fails on some numerical values)
+--FILE--
+<?php
+
+echo php_strip_whitespace(__DIR__ . '/bug71806.dat');
+
+?>
+--EXPECT--
+<?php
+ echo 098 ;