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

2020-11-02 20:57:23 +00:00 · 2020-11-02 20:57:23 +00:00 · 8b1ac7ada3
commit 8b1ac7ada3
parent 199bb4a612 063094e1a7
1 changed files with 4 additions and 0 deletions
--- a/gnss/common/utils/default/include/v2_1/GnssTemplate.h
+++ b/gnss/common/utils/default/include/v2_1/GnssTemplate.h
@ -689,6 +689,10 @@ Return<void> GnssTemplate<T_IGnss>::help(const hidl_handle& fd) {
 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") {