commit 6418bb7d3473d7ed6dc64273909e1fa3ee0812ea
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 18 14:15:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 18 14:15:13 2018 +0000
tree 794480cd6de515bdd306f112b7a9ae910f77251c
parent fa96af82f3d30dbfba2093f6575dc10eeee71da6
parent bda3032fcc95e3f2b7f6574d01c443eb7b065ba4

Merge "Do not crash if secontext is nullptr"

vold_prepare_subdirs.cpp

diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 1b466e9..8c3df30 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -63,7 +63,8 @@
         secontext.reset(tmp_secontext);
     }
     LOG(DEBUG) << "Setting up mode " << std::oct << mode << std::dec << " uid " << uid << " gid "
-               << gid << " context " << secontext.get() << " on path: " << path;
+               << gid << " context " << (secontext ? secontext.get() : "null")
+               << " on path: " << path;
     if (secontext) {
         if (setfscreatecon(secontext.get()) != 0) {
             PLOG(ERROR) << "Unable to read setfscreatecon for: " << path;