From 43f492c872d5365b49fa33e269671748b6cd05f1 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 26 Sep 2007 15:46:28 +0000
Subject: [PATCH] MFB: Fixed bug #42767 (highlight_string() truncates trailing
 comment).

---
 Zend/tests/bug42767.phpt | 11 +++++++++++
 Zend/zend_highlight.c    | 14 ++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 Zend/tests/bug42767.phpt

diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/bug42767.phpt
new file mode 100644
index 0000000000..0de4dba5fb
--- /dev/null
+++ b/Zend/tests/bug42767.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #42767 (highlight_string() truncates trailing comments)
+--FILE--
+<?php
+highlight_string('<?php /*some comment..');
+?>
+--EXPECT--
+<code><span style="color: #000000">
+<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #FF8000">/*some&nbsp;comment..</span>
+</span>
+</code>
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 07445f1fc8..de411506c9 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -160,6 +160,20 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 		}
 		Z_TYPE(token) = 0;
 	}
+
+	/* handler for trailing comments, see bug #42767 */
+	if (LANG_SCNG(yy_leng) && LANG_SCNG(_yy_more_len)) {
+		if (last_color != syntax_highlighter_ini->highlight_comment) {
+			if (last_color != syntax_highlighter_ini->highlight_html) {
+				zend_printf("</span>");
+			}
+			if (syntax_highlighter_ini->highlight_comment != syntax_highlighter_ini->highlight_html) {
+				zend_printf("<span style=\"color: %s\">", syntax_highlighter_ini->highlight_comment);
+			}
+		}
+		zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(_yy_more_len) TSRMLS_CC);
+	}
+
 	if (last_color != syntax_highlighter_ini->highlight_html) {
 		zend_printf("</span>\n");
 	}
-- 
2.40.0