commit 18afaca1ad6f480ab6ac259278c8c8013aaab45a
author Jeff Sharkey <jsharkey@google.com> Thu Oct 17 16:12:38 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 17 16:12:38 2013 +0000
tree db2149bde46520d37ff45ef0ad522528742ddb1a
parent 4d9c9bd5cc5f81954b1e9724d125b8947b412b04
parent 5ab02e787a05eda1d3382654d5496d6c763c2474

Merge "DO NOT MERGE. Fix crash in vold" into klp-dev

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);