From 985e08eeb9b5ae440ff531b97bbec7daee33b825 Mon Sep 17 00:00:00 2001
From: Sotaro Ikeda <sikeda@mozilla.com>
Date: Wed, 4 Dec 2013 17:44:36 -0500
Subject: [PATCH] Bug 941789 - Protect binderDied() by mutex. r=doublec

--HG--
extra : rebase_source : 9538d1cbc107f597ccc3237fce8da26040707ce6
---
 .../omx/mediaresourcemanager/MediaResourceManagerService.cpp     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
index 372d88f4c27..d1bff9f35be 100644
--- a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
+++ b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
@@ -46,6 +46,7 @@ MediaResourceManagerService::~MediaResourceManagerService()
 void MediaResourceManagerService::binderDied(const wp<IBinder>& who)
 {
   if (who != NULL) {
+    Mutex::Autolock autoLock(mLock);
     sp<IBinder> binder = who.promote();
     if (binder != NULL) {
       cancelClientLocked(binder);