From: Nikita Popov <nikic@php.net>
Date: Fri, 11 Dec 2015 15:04:32 +0000 (+0100)
Subject: Fix bug #71086
X-Git-Tag: php-7.0.2RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd3ece8578326410ccd045332c57e6fec5a88bad;p=php

Fix bug #71086
---

diff --git a/NEWS b/NEWS
index 7f45f980f7..89c5fa87ab 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP                                                                        NEWS
   . Fixed bug #70781 (Extension tests fail on dynamic ext dependency).
     (Francois Laupretre)
   . Fixed bug #71089 (No check to duplicate zend_extension). (Remi)
+  . Fixed bug #71086 (Invalid numeric literal parse error within
+    highlight_string() function). (Nikita)
 
 - DBA:
   . Fixed key leak with invalid resource. (Laruence)
diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/bug71086.phpt
new file mode 100644
index 0000000000..a7600c51fd
--- /dev/null
+++ b/Zend/tests/bug71086.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #71086: Invalid numeric literal parse error within highlight_string() function
+--FILE--
+<?php
+
+$highlightedString = highlight_string("<?php \n 09 09 09;", true);
+var_dump($highlightedString);
+
+?>
+--EXPECT--
+string(169) "<code><span style="color: #000000">
+<span style="color: #0000BB">&lt;?php&nbsp;<br />&nbsp;</span><span style="color: #007700">09&nbsp;09&nbsp;09;</span>
+</span>
+</code>"
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 4f870af448..94ba9481df 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -25,6 +25,7 @@
 #include "zend_highlight.h"
 #include "zend_ptr_stack.h"
 #include "zend_globals.h"
+#include "zend_exceptions.h"
 
 ZEND_API void zend_html_putc(char c)
 {
@@ -168,6 +169,9 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 	}
 	zend_printf("</span>\n");
 	zend_printf("</code>");
+
+	/* Discard parse errors thrown during tokenization */
+	zend_clear_exception();
 }
 
 ZEND_API void zend_strip(void)