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

11 years ago · 18afaca1ad
parent 4d9c9bd5cc 5ab02e787a
commit 18afaca1ad
1 changed files with 1 additions and 1 deletions
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@ -1584,7 +1584,7 @@ int VolumeManager::mkdirs(char* path) {
    // 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);