From: Zeev Suraski <zeev@php.net>
Date: Mon, 22 Nov 1999 16:30:23 +0000 (+0000)
Subject: Fix #2744
X-Git-Tag: PRE_RETURN_REF_PATCH~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86a0efcff54fbc3f5d69d2f2d096c3e74b559f31;p=php

Fix #2744
---

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 15d0f1abf4..3960c5692d 100644
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -1117,6 +1117,7 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 }
 
 <ST_IN_SCRIPTING>"/*" {
+	CG(comment_start_line) = CG(zend_lineno);
 	BEGIN(ST_COMMENT);
 	yymore();
 }
@@ -1507,6 +1508,12 @@ ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 	return 0;
 }
 
+<ST_COMMENT><<EOF>> {
+	zend_error(E_COMPILE_WARNING,"Unterminated comment starting line %d", CG(comment_start_line));
+	return 0;
+}
+	
+
 
 <ST_IN_SCRIPTING,INITIAL,ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_SINGLE_QUOTE>. {
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d",yytext[0],yytext[0],YYSTATE);
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 2a7ceeb6a9..d61542d506 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -75,6 +75,7 @@ struct _zend_compiler_globals {
 	char *compiled_filename;
 
 	int zend_lineno;
+	int comment_start_line;
 	char *heredoc;
 	int heredoc_len;