commit 5ab02e787a05eda1d3382654d5496d6c763c2474
author Marco Nelissen <marcone@google.com> Tue Oct 15 15:22:28 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Oct 16 10:52:29 2013 -0700
tree db2149bde46520d37ff45ef0ad522528742ddb1a
parent 3a941d6812ccf52fd4fe1c1891041c14f25d0b91

DO NOT MERGE. Fix crash in vold

b/11239345

Change-Id: I46a8d6b38e3c093e20e1e5c4f01efc13d1960ad4

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 1690a01..950138c 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1584,7 +1584,7 @@
     // Require that path lives under a volume we manage
     const char* emulated_source = getenv("EMULATED_STORAGE_SOURCE");
     const char* root = NULL;
-    if (!strncmp(path, emulated_source, strlen(emulated_source))) {
+    if (emulated_source && !strncmp(path, emulated_source, strlen(emulated_source))) {
         root = emulated_source;
     } else {
         Volume* vol = getVolumeForFile(path);