commit 8b1ac7ada39ecc68e0b83ed4ddcb870a3d3edd94
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 02 20:57:23 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 02 20:57:23 2020 +0000
tree 63eb44003087a6a49a2675e3ad2bbac857b8529d
parent 199bb4a6125708024164d68cd559874ff5aebca6
parent 063094e1a795a84f950a453a0fea190e7963b023

Merge "Check the fd handle before attempting to use it in GNSS HAL"

gnss/common/utils/default/include/v2_1/GnssTemplate.h

diff --git a/gnss/common/utils/default/include/v2_1/GnssTemplate.h b/gnss/common/utils/default/include/v2_1/GnssTemplate.h
index 7c3c58a..cbf3933 100644
--- a/gnss/common/utils/default/include/v2_1/GnssTemplate.h
+++ b/gnss/common/utils/default/include/v2_1/GnssTemplate.h
@@ -689,6 +689,10 @@
 template <class T_IGnss>
 Return<void> GnssTemplate<T_IGnss>::debug(const hidl_handle& fd,
                                           const hidl_vec<hidl_string>& options) {
+    if (fd == nullptr || fd->numFds == 0) {
+        return Void();
+    }
+
     if (options.size() == 0) {
         return help(fd);
     } else if (options[0] == "location") {