commit 60ef32503df0deeb8a0a54375cf74323165f5830
author Tharaga Balachandran <tbalacha@codeaurora.org> Wed Apr 10 11:26:44 2019 -0400
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 10 12:26:26 2019 -0700
tree 1168503f13b97efee69b3940557446efc501fc50
parent 3e97861669e13a61a8ba397f7cfa9c6ee6e522ba

gralloc: Fix null pointer dereference

CRs-Fixed: 2433109
Change-Id: Ie0bbf848bd6049a1d5cf4ad72a5b04c55d058f34

gralloc/QtiMapper.cpp

diff --git a/gralloc/QtiMapper.cpp b/gralloc/QtiMapper.cpp
index a885a7b..3d2e437 100644
--- a/gralloc/QtiMapper.cpp
+++ b/gralloc/QtiMapper.cpp
@@ -267,30 +267,30 @@
 Return<void> QtiMapper::getMapSecureBufferFlag(void *buffer, getMapSecureBufferFlag_cb hidl_cb) {
   auto err = Error::BAD_BUFFER;
   auto hnd = static_cast<private_handle_t *>(buffer);
-  int *map_secure_buffer = 0;
+  int map_secure_buffer = 0;
   if (buffer != nullptr && private_handle_t::validate(hnd) == 0) {
-    if (getMetaData(hnd, GET_MAP_SECURE_BUFFER, map_secure_buffer) != 0) {
-      *map_secure_buffer = 0;
+    if (getMetaData(hnd, GET_MAP_SECURE_BUFFER, &map_secure_buffer) != 0) {
+      map_secure_buffer = 0;
     } else {
       err = Error::NONE;
     }
   }
-  hidl_cb(err, *map_secure_buffer != 0);
+  hidl_cb(err, map_secure_buffer != 0);
   return Void();
 }
 
 Return<void> QtiMapper::getInterlacedFlag(void *buffer, getInterlacedFlag_cb hidl_cb) {
   auto err = Error::BAD_BUFFER;
   auto hnd = static_cast<private_handle_t *>(buffer);
-  int *interlaced_flag = nullptr;
+  int interlaced_flag = 0;
   if (buffer != nullptr && private_handle_t::validate(hnd) == 0) {
-    if (getMetaData(hnd, GET_PP_PARAM_INTERLACED, interlaced_flag) != 0) {
-      *interlaced_flag = 0;
+    if (getMetaData(hnd, GET_PP_PARAM_INTERLACED, &interlaced_flag) != 0) {
+      interlaced_flag = 0;
     } else {
       err = Error::NONE;
     }
   }
-  hidl_cb(err, *interlaced_flag != 0);
+  hidl_cb(err, interlaced_flag != 0);
   return Void();
 }