summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 20:08:12 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 20:08:12 +0000
commitf6af082ba5c09b46ea18477b64f492f5e6059ef4 (patch)
tree08701d417513b80b94c4802ee20f70da681787e2 /media
parentbb65ef73575a1413943dfd517973b29f855e6007 (diff)
downloadchromium_src-f6af082ba5c09b46ea18477b64f492f5e6059ef4.zip
chromium_src-f6af082ba5c09b46ea18477b64f492f5e6059ef4.tar.gz
chromium_src-f6af082ba5c09b46ea18477b64f492f5e6059ef4.tar.bz2
Fix a crash that media player can get released while getting cookies
Since we are using an async task to get the cookies, it is possible that the media player get released before the cookies are retrieved. Do nothing if this is the case Review URL: https://chromiumcodereview.appspot.com/11299076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/android/media_player_bridge.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index ad5e161..a0c6a0e 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -125,6 +125,8 @@ void MediaPlayerBridge::Prepare() {
void MediaPlayerBridge::GetCookiesCallback(const std::string& cookies) {
cookies_ = cookies;
has_cookies_ = true;
+ if (j_media_player_.is_null())
+ return;
JNIEnv* env = AttachCurrentThread();
CHECK(env);