Changeset 61450 in webkit for trunk/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Jun 18, 2010, 4:09:23 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-18 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Incorrect handling of multiple BOMs scattered through a file.
​https://bugs.webkit.org/show_bug.cgi?id=40865

When determining the offset of open and close braces in a source
with BOMs we were finishing our count early as we failed to account
for BOMs prior to the open/close brace positions effecting those
positions.

• parser/Lexer.cpp: (JSC::Lexer::sourceCode):

2010-06-18 Oliver Hunt <​[email protected]>

Reviewed by Geoffrey Garen.

Incorrect handling of multiple BOMs scattered through a file.
​https://bugs.webkit.org/show_bug.cgi?id=40865

Put a few more BOMs into this testcase so that it hits the other cases
that were missed before.

• fast/js/resources/bom-in-file-retains-correct-offset.js: (g.f): (g):

File:

• trunk/JavaScriptCore/parser/Lexer.cpp (modified) (1 diff)

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -1025 +1025 @@
 
     const UChar* data = m_source->provider()->data();
-
+    
     ASSERT(openBrace < closeBrace);
-
-    int numBOMsBeforeOpenBrace = 0;
-    int numBOMsBetweenBraces = 0;
-
     int i;
-    for (i = m_source->startOffset(); i < openBrace; ++i)
-        numBOMsBeforeOpenBrace += data[i] == byteOrderMark;
-    for (; i < closeBrace; ++i)
-        numBOMsBetweenBraces += data[i] == byteOrderMark;
-
-    return SourceCode(m_source->provider(), openBrace + numBOMsBeforeOpenBrace,
-        closeBrace + numBOMsBeforeOpenBrace + numBOMsBetweenBraces + 1, firstLine);
+    for (i = m_source->startOffset(); i < openBrace; ++i) {
+        if (data[i] == byteOrderMark) {
+            openBrace++;
+            closeBrace++;
+        }
+    }
+    for (; i < closeBrace; ++i) {
+        if (data[i] == byteOrderMark)
+            closeBrace++;
+    }
+
+    ASSERT(openBrace < closeBrace);
+
+    return SourceCode(m_source->provider(), openBrace, closeBrace + 1, firstLine);
 }