From 259aca3f476d22b013f452bcd43ec67e3ec85e11 Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Tue, 24 Feb 2015 16:38:41 +1100
Subject: [PATCH] Bug 1132342: Handle race should operation be aborted while
 reading metadata. r=karlt

---
 dom/media/mediasource/TrackBuffer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dom/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp
index ffe8dedf1d5e..bc0c79c63809 100644
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@@ -614,6 +614,10 @@ TrackBuffer::InitializeDecoder(SourceBufferDecoder* aDecoder)
     MSE_DEBUG("was shut down while reading metadata. Aborting initialization.");
     return;
   }
+  if (mCurrentDecoder != aDecoder) {
+    MSE_DEBUG("append was cancelled. Aborting initialization.");
+    return;
+  }
 
   if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
     mWaitingDecoders.AppendElement(aDecoder);