commit 9e807ea6db2c3ea7203844cefb31b1afa06619c3
author Jeff Sharkey <jsharkey@android.com> Thu Dec 03 17:46:20 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 03 17:46:20 2015 +0000
tree b9491236540856833326b75ac449f82e147895ab
parent a619c191cc06c08fb19e1bdd486a41da65f6c0af
parent de629f105e12122ba042a8ae86b2130ef9a608bb

Merge "Make sure path is not NULL to avoid fatal exception." am: e0e5bfeb3c
am: de629f105e

* commit 'de629f105e12122ba042a8ae86b2130ef9a608bb':
  Make sure path is not NULL to avoid fatal exception.

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 46682dc..ea5574b 100755
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -283,8 +283,8 @@
         evt->dump();
     }
 
-    std::string eventPath(evt->findParam("DEVPATH"));
-    std::string devType(evt->findParam("DEVTYPE"));
+    std::string eventPath(evt->findParam("DEVPATH")?evt->findParam("DEVPATH"):"");
+    std::string devType(evt->findParam("DEVTYPE")?evt->findParam("DEVTYPE"):"");
 
     if (devType != "disk") return;