commit 95d26139a41924f35add2d9584bfe3f9f00db756
author Roman Kiryanov <rkir@google.com> Tue Sep 18 07:26:00 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 18 07:26:00 2018 -0700
tree 794480cd6de515bdd306f112b7a9ae910f77251c
parent def8ce02b6a0edee851f371a890c9223cfea1006
parent 6418bb7d3473d7ed6dc64273909e1fa3ee0812ea

Merge "Do not crash if secontext is nullptr"
am: 6418bb7d34

Change-Id: Iad725cb3c6a40a0917106dee3b2b604b1cb921a5

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;