commit 0f4bee02b97377aed2712619c543b2560f3a6f0d
author Steven Moreland <smoreland@google.com> Wed Feb 07 13:51:07 2018 -0800
committer Steven Moreland <smoreland@google.com> Thu Feb 08 00:48:41 2018 +0000
tree d1f8a8a27cbc6a7469171583f0dd4b0401543cef
parent 2b89fd3e5d3b2d113ccbd7159428949093cca1f8

Fix nullptr dereference.

This is causing an error in vts_ibase_test.

Bug: N/A
Test: vts_ibase_test on marlin [  PASSED  ] 6 tests.
Change-Id: I5cfac8e3643ff5855c6d5ef69b64ba2786bc7d59

contexthubhal/NanohubHidlAdapter.cpp

diff --git a/contexthubhal/NanohubHidlAdapter.cpp b/contexthubhal/NanohubHidlAdapter.cpp
index a6a471a..fcfb371 100644
--- a/contexthubhal/NanohubHidlAdapter.cpp
+++ b/contexthubhal/NanohubHidlAdapter.cpp
@@ -519,6 +519,10 @@
 
 Return<void> Contexthub::debug(const hidl_handle& hh_fd,
                                const hidl_vec<hidl_string>& hh_data) {
+    if (hh_fd == nullptr || hh_fd->numFds < 1) {
+        return Void();
+    }
+
     String8 result;
     int fd = hh_fd.getNativeHandle()->data[0];