Bug 1310162 - mTrack in SimpleTextTrackEvent might be null. r=jwwang draft
authorbechen <bechen@mozilla.com>
Wed, 28 Dec 2016 15:51:37 +0800
changeset 454137 b8ad44e919992a7eaa3e8e1db9b0c5258c66d617
parent 454036 c71725ea20d206f121a9aa7661241278c7cf9cbd
child 540626 fcedacdf16593512e8e3c5953c7f8d36baa74b8d
push id39842
push userbechen@mozilla.com
push dateWed, 28 Dec 2016 07:53:46 +0000
reviewersjwwang
bugs1310162
milestone53.0a1
Bug 1310162 - mTrack in SimpleTextTrackEvent might be null. r=jwwang MozReview-Commit-ID: ESqYqBem7kQ
dom/html/TextTrackManager.cpp
--- a/dom/html/TextTrackManager.cpp
+++ b/dom/html/TextTrackManager.cpp
@@ -486,21 +486,23 @@ private:
   TextTrack* mTrack;
   RefPtr<TextTrackCue> mCue;
 };
 
 class CompareSimpleTextTrackEvents {
 private:
   int32_t TrackChildPosition(SimpleTextTrackEvent* aEvent) const
   {
-    HTMLTrackElement* trackElement = aEvent->mTrack->GetTrackElement();;
-    if (!trackElement) {
-      return -1;
+    if (aEvent->mTrack) {
+      HTMLTrackElement* trackElement = aEvent->mTrack->GetTrackElement();
+      if (trackElement) {
+        return mMediaElement->IndexOf(trackElement);
+      }
     }
-    return mMediaElement->IndexOf(trackElement);
+    return -1;
   }
   HTMLMediaElement* mMediaElement;
 public:
   explicit CompareSimpleTextTrackEvents(HTMLMediaElement* aMediaElement)
   {
     mMediaElement = aMediaElement;
   }