LocIpc derefs nullptr if stopping blocking listener

LocIpcRunnable is created only for nonBlocking listeners.
But stopListening would use LocIpcRunnable not knowing if
this is a blocking or nonblocking listener. LocIpcRunnable
is no longer a shared resource between the two threads. We
use a copy of string to keep the needed socket name.

Change-Id: Ib5c57a89f630807d6d03f3fbc698a56b9ffddf4d
CRs-Fixed: 2431397

1 files changed, 4 insertions, 2 deletions

diff --git a/utils/LocIpc.h b/utils/LocIpc.h
index 87f2ff8..2dee5ff 100644
--- a/utils/LocIpc.h
+++ b/utils/LocIpc.h
@@ -37,6 +37,8 @@
 #include <sys/un.h>
 #include <LocThread.h>
 
+using std::string;
+
 namespace loc_util {
 
 class LocIpcSender;
@@ -44,7 +46,7 @@ class LocIpcSender;
 class LocIpc {
 friend LocIpcSender;
 public:
-    inline LocIpc() : mIpcFd(-1), mRunnable(nullptr) {}
+    inline LocIpc() : mIpcFd(-1) {}
     inline virtual ~LocIpc() { stopListening(); }
 
     // Listen for new messages in current thread. Calling this funciton will
@@ -94,7 +96,7 @@ private:
 
     int mIpcFd;
     LocThread mThread;
-    LocRunnable *mRunnable;
+    string mIpcName;
 };
 
 class LocIpcSender {