Changeset 99039 in webkit

Timestamp:

Nov 1, 2011 10:48:12 PM (12 years ago)

Author:

annacc@chromium.org

Message:

Small fixes for WebVTTParser.
​https://bugs.webkit.org/show_bug.cgi?id=71334

Reviewed by Darin Adler.

No new tests. This is needed to enable other tests, coming soon.

• html/track/WebVTTParser.cpp:

(WebCore::hasLongWebVTTIdentifier): changed to return true when header is

exactly "WEBVTT"

(WebCore::WebVTTParser::collectTimingsAndSettings): fix typos, position should

only progress once when checking the character after a timestamp.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/track/WebVTTParser.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-01  Anna Cavender  <annacc@chromium.org>
+
+        Small fixes for WebVTTParser.
+        https://bugs.webkit.org/show_bug.cgi?id=71334
+
+        Reviewed by Darin Adler.
+
+        No new tests.  This is needed to enable other tests, coming soon.
+
+        * html/track/WebVTTParser.cpp:
+        (WebCore::hasLongWebVTTIdentifier): changed to return true when header is
+            exactly "WEBVTT"
+        (WebCore::WebVTTParser::collectTimingsAndSettings): fix typos, position should
+            only progress once when checking the character after a timestamp.
+
 2011-11-01  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/html/track/WebVTTParser.cpp

@@ -65 +65 @@
 
     // or the seventh character is neither a space nor a tab character, then abort.
-    if (line[fileIdentiferLength] != ' ' && line[fileIdentiferLength] != '\t')
+    if (line.length() > fileIdentiferLength && line[fileIdentiferLength] != ' ' && line[fileIdentiferLength] != '\t')
         return false;
 
@@ -191 +191 @@
     if (m_currentStartTime == malformedTime)
         return BadCue;
-    if (line[position++] != ' ' && line[position++] != '\t')
+    if (position >= line.length())
+        return BadCue;
+    char nextChar = line[position++];
+    if (nextChar != ' ' && nextChar != '\t')
         return BadCue;
     skipWhiteSpace(line, &position);
@@ -199 +202 @@
         return BadCue;
     position += 3;
-    if (line[position++] != ' ' && line[position++] != '\t')
+    if (position >= line.length())
+        return BadCue;
+    nextChar = line[position++];
+    if (nextChar != ' ' && nextChar != '\t')
         return BadCue;
     skipWhiteSpace(line, &position);