commit a48820e6c2b7ea3712e2934b1684d2bd0c63acf1
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 24 21:52:57 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 24 21:52:57 2014 -0700
tree 2008dee38adddc242dfd043bfec5720df0919334
parent 11c37a82b72f39f28764696e4aabe8060b1883cc
parent dab393806c59bde2049b834466f069f26f74590a

Merge "hwc: Fix null dereference"

libhwcomposer/hwc_utils.cpp

diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 4447cfd..a0cbc68 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -273,9 +273,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;