提交: 5a5b16cf7f3eb6845815be60f7bdc4c2bcf896a3 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• 修訂: 5a5b16cf7f3eb6845815be60f7bdc4c2bcf896a3 (tree)
• 時間: 2009-06-13 05:17:04
• 作者: Android (Google) Code Review <android-gerrit@goog...>
• Commiter: Android (Google) Code Review

Log Message

Merge change 4084

* changes:

Handle end-of-file inside of comments, local declarations.

Change Summary

• modified: libacc/acc.cpp

差異

--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -1995,18 +1995,21 @@ class Compiler : public ErrorSink {
                 }
             } else if ((tok == '/') & (ch == '*')) {
                 inp();
-                while (ch) {
-                    while (ch != '*')
+                while (ch && ch != EOF) {
+                    while (ch != '*' && ch != EOF)
                         inp();
                     inp();
                     if (ch == '/')
                         ch = 0;
                 }
+                if (ch == EOF) {
+                    error("End of file inside comment.");
+                }
                 inp();
                 next();
             } else if ((tok == '/') & (ch == '/')) {
                 inp();
-                while (ch && (ch != '\n')) {
+                while (ch && (ch != '\n') && (ch != EOF)) {
                     inp();
                 }
                 inp();
@@ -2489,7 +2492,7 @@ class Compiler : public ErrorSink {
         Type base;
 
         while (acceptType(base)) {
-            while (tok != ';') {
+            while (tok != ';' && tok != EOF) {
                 Type t = acceptPointerDeclaration(t);
                 addLocalSymbol();
                 if (tok) {