From 1eaccb66699f1578e70a47dd81ca90f1aaff75c6 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Wed, 2 May 2012 13:10:29 -0700
Subject: [PATCH] Fix intermittent native fault in Widevine

Change-Id: I19e0b19eb9e53ca19dea10a46cf286fb091d7542
related-to-bug: 6432496
---
 proprietary/wvm/WVMMediaSource.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp
index 4f8c1eb3..bec540a8 100644
--- a/proprietary/wvm/WVMMediaSource.cpp
+++ b/proprietary/wvm/WVMMediaSource.cpp
@@ -422,7 +422,13 @@ WVStatus WVMMediaSource::DecryptCallback(WVEsSelector esType, void* input, void*
 {
     //ALOGD("DecryptCallback(type=%d, in=%p, out=%p, len=%d, key=%d\n",
     //     (int)esType, input, output, length, key);
+
     WVMExtractorImpl *extractor = (WVMExtractorImpl *)obj;
+    if (!extractor) {
+        ALOGE("WVMMediaSource::DecryptCallback - no extractor!");
+        return WV_Status_Unknown;
+    }
+
     sp<WVMMediaSource> source;
     if (esType == WV_EsSelector_Video)
         source = extractor->getVideoSource();