Changeset 152459 in webkit

Timestamp:

Jul 8, 2013 11:33:32 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix TextTrackCue::cueIndex() to handle the null case of TextTrack::cues(() properly
​https://bugs.webkit.org/show_bug.cgi?id=117815
<rdar://problem/14211041>

Patch by Ruth Fong <​ruth_fong@apple.com> on 2013-07-08
Reviewed by Eric Carlson.

Merge ​https://src.chromium.org/viewvc/blink?revision=153206&view=revision

No new tests, only behavior change is preventing a crash in the release build.
cueIndex() is only used for sorting cues, so returning an invalidCueIndex in the case
where track()->cues() is null makes sense and won't modify behavior.

• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::cueIndex):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/track/TextTrackCue.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-08  Ruth Fong  <ruth_fong@apple.com>
+
+        Fix TextTrackCue::cueIndex() to handle the null case of TextTrack::cues(() properly
+        https://bugs.webkit.org/show_bug.cgi?id=117815
+        <rdar://problem/14211041>
+
+        Reviewed by Eric Carlson.
+
+        Merge https://src.chromium.org/viewvc/blink?revision=153206&view=revision
+        
+        No new tests, only behavior change is preventing a crash in the release build.
+        cueIndex() is only used for sorting cues, so returning an invalidCueIndex in the case
+        where track()->cues() is null makes sense and won't modify behavior.
+
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::cueIndex):
+
 2013-07-08  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -487 +487 @@
         ASSERT(track());
         ASSERT(track()->cues());
-        m_cueIndex = track()->cues()->getCueIndex(this);
+        if (TextTrackCueList* cueList = track()->cues())
+            m_cueIndex = cueList->getCueIndex(this);
     }