Merge "Do not crash if secontext is nullptr"

am: 6418bb7d34 Change-Id: Iad725cb3c6a40a0917106dee3b2b604b1cb921a5
6 years ago · 95d26139a4
parent def8ce02b6 6418bb7d34
commit 95d26139a4
1 changed files with 2 additions and 1 deletions
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@ -63,7 +63,8 @@ static bool prepare_dir(struct selabel_handle* sehandle, mode_t mode, uid_t uid,
        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;