From c1e10a3369e5c38bf31ce12ddd6b7f51c380c04b Mon Sep 17 00:00:00 2001
From: Joseph Pirozzo <pirozzoj@google.com>
Date: Tue, 13 Nov 2018 08:18:43 -0800
Subject: [PATCH] Initialize pointers for vendor_interface

Default member variables to nullptr.

Bug: 118075338
Test: Inspection
Change-Id: I5fc8a5b45d2c1116036139e308743a1928abaef3
---
 bluetooth/1.0/default/vendor_interface.cc | 1 +
 bluetooth/1.0/default/vendor_interface.h  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index e5f02f3793..d56e344e74 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -294,6 +294,7 @@ void VendorInterface::Close() {
     lib_interface_->op(BT_VND_OP_POWER_CTRL, &power_state);
 
     lib_interface_->cleanup();
+    lib_interface_ = nullptr;
   }
 
   if (lib_handle_ != nullptr) {
diff --git a/bluetooth/1.0/default/vendor_interface.h b/bluetooth/1.0/default/vendor_interface.h
index 36f4e1b08e..1d69040d90 100644
--- a/bluetooth/1.0/default/vendor_interface.h
+++ b/bluetooth/1.0/default/vendor_interface.h
@@ -58,15 +58,15 @@ class VendorInterface {
 
   void HandleIncomingEvent(const hidl_vec<uint8_t>& hci_packet);
 
-  void* lib_handle_;
-  bt_vendor_interface_t* lib_interface_;
+  void* lib_handle_ = nullptr;
+  bt_vendor_interface_t* lib_interface_ = nullptr;
   async::AsyncFdWatcher fd_watcher_;
   InitializeCompleteCallback initialize_complete_cb_;
-  hci::HciProtocol* hci_;
+  hci::HciProtocol* hci_ = nullptr;
 
   PacketReadCallback event_cb_;
 
-  FirmwareStartupTimer* firmware_startup_timer_;
+  FirmwareStartupTimer* firmware_startup_timer_ = nullptr;
 };
 
 }  // namespace implementation