commit be52460cdb8bba3987c4a17308624ffe88408033
author James Dong <jdong@google.com> Mon Sep 17 14:44:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 14:44:15 2012 -0700
tree 7a5e120e2a6644b4c9a59b7a0310ce55485cb85d
parent 98bc0b929c682adb59595688d5b87081218eaa3c
parent 9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1

am 9568b4cd: am 376074ed: Fixed a native crash due to deref of a NULL pointer

* commit '9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1':
  Fixed a native crash due to deref of a NULL pointer

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index c09f86f..756e76a 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -961,7 +961,8 @@
 
 status_t NuPlayer::setVideoScalingMode(int32_t mode) {
     mVideoScalingMode = mode;
-    if (mNativeWindow != NULL) {
+    if (mNativeWindow != NULL
+            && mNativeWindow->getNativeWindow() != NULL) {
         status_t ret = native_window_set_scaling_mode(
                 mNativeWindow->getNativeWindow().get(), mVideoScalingMode);
         if (ret != OK) {