Fix #2744

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index 15d0f1abf4c4466b8ef75a918f96a3a1482e9b02..3960c5692d19c1ad25575772d7dcbc9a9113c4d9 100644 (file)
--- 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 2a7ceeb6a9a0abc1eef2c02af0d46bf2061cfa93..d61542d5068c2315f019af9fbd52327a4cf13688 100644 (file)
--- 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;