Changeset 293672 in webkit

Timestamp:

May 2, 2022 12:01:44 PM (3 months ago)

Author:

Fujii Hironori

Message:

HTML Parser: Wrong column number in CR-LF line ending style (DOS EOL style) HTML files
​https://bugs.webkit.org/show_bug.cgi?id=239947

Reviewed by Myles C. Maxfield.

Source/WebCore:

JS stack trace reported wrong column numbers in CR-LF line ending
HTML files. m_numberOfCharactersConsumedPriorToCurrentLine was the
number of characters included the preceding CR but the following
LF in those files.

In SegmentedString::advance, startNewLine() is called after
decrementing m_currentSubstring.length. In
SegmentedString::advancePastNewline, however, startNewLine() was
called before calling decrementAndCheckLength(). startNewLine()
should be called after decrementing.

Test: js/dom/line-column-numbers-cr-lf.html

• platform/text/SegmentedString.h:

(WebCore::SegmentedString::advancePastNewline):
Call startNewLine() after decrementAndCheckLength() is called.

LayoutTests:

• js/dom/line-column-numbers-cr-lf-expected.txt: Added.
• js/dom/line-column-numbers-cr-lf.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/dom/line-column-numbers-cr-lf-expected.txt (added)
• LayoutTests/js/dom/line-column-numbers-cr-lf.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/text/SegmentedString.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-05-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        HTML Parser: Wrong column number in CR-LF line ending style (DOS EOL style) HTML files
+        https://bugs.webkit.org/show_bug.cgi?id=239947
+
+        Reviewed by Myles C. Maxfield.
+
+        * js/dom/line-column-numbers-cr-lf-expected.txt: Added.
+        * js/dom/line-column-numbers-cr-lf.html: Added.
+
 2022-05-02  Oriol Brufau  <obrufau@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-02  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        HTML Parser: Wrong column number in CR-LF line ending style (DOS EOL style) HTML files
+        https://bugs.webkit.org/show_bug.cgi?id=239947
+
+        Reviewed by Myles C. Maxfield.
+
+        JS stack trace reported wrong column numbers in CR-LF line ending
+        HTML files. m_numberOfCharactersConsumedPriorToCurrentLine was the
+        number of characters included the preceding CR but the following
+        LF in those files.
+
+        In SegmentedString::advance, startNewLine() is called after
+        decrementing m_currentSubstring.length. In
+        SegmentedString::advancePastNewline, however, startNewLine() was
+        called before calling decrementAndCheckLength(). startNewLine()
+        should be called after decrementing.
+
+        Test: js/dom/line-column-numbers-cr-lf.html
+
+        * platform/text/SegmentedString.h:
+        (WebCore::SegmentedString::advancePastNewline):
+        Call startNewLine() after decrementAndCheckLength() is called.
+
 2022-05-02  Oriol Brufau  <obrufau@igalia.com>
 

trunk/Source/WebCore/platform/text/SegmentedString.h

@@ -248 +248 @@
     ASSERT(m_currentCharacter == '\n');
     if (m_currentSubstring.length > 1) {
+        m_currentCharacter = m_currentSubstring.currentCharacterPreIncrement();
+        decrementAndCheckLength();
         if (m_currentSubstring.doNotExcludeLineNumbers)
             startNewLine();
-        m_currentCharacter = m_currentSubstring.currentCharacterPreIncrement();
-        decrementAndCheckLength();
         return;
     }