commit dab393806c59bde2049b834466f069f26f74590a
author Charles Bin <cbin@codeaurora.org> Mon Jun 30 10:34:30 2014 -0700
committer Charles Bin <cbin@codeaurora.org> Mon Jun 30 10:37:33 2014 -0700
tree 9b06adb79caa1da4585e077dcaa51c76e6ff621b
parent 444a423021462c560af3d77c27e6c824ed4d0640

hwc: Fix null dereference

Fix possible null dereference in hwc.

Change-Id: Ib403d4b742cc52175b93268c023ba273377e7b91

libhwcomposer/hwc_utils.cpp

diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 18ae28f..fd02d30 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -259,9 +259,15 @@
     //independent process as well.
     QService::init();
     sp<IQClient> client = new QClient(ctx);
-    interface_cast<IQService>(
+    android::sp<qService::IQService> qservice_sp = interface_cast<IQService>(
             defaultServiceManager()->getService(
-            String16("display.qservice")))->connect(client);
+            String16("display.qservice")));
+    if (qservice_sp.get()) {
+      qservice_sp->connect(client);
+    } else {
+      ALOGE("%s: Failed to acquire service pointer", __FUNCTION__);
+      return ;
+    }
 
     // Initialize device orientation to its default orientation
     ctx->deviceOrientation = 0;