tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not crash if secontext is nullptr

Browse source 
LOG(DEBUG) tries to print a string pointed by secontext.get() but
crashed if it was nullptr.

Bug: 111888637
Test: "make -j50" and ran emulator
Change-Id: Iac78f650e7f48781030dc610f7d35cd52c250802
Merged-In: Iac78f650e7f48781030dc610f7d35cd52c250802
Signed-off-by: Roman Kiryanov <rkir@google.com>
This commit is contained in:
Roman Kiryanov 2018-07-26 13:41:14 -07:00 committed by Paul Crowley
parent 3a7f95af09
commit bda3032fcc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vold_prepare_subdirs.cpp
View file

@ -63,7 +63,8 @@ static bool prepare_dir(struct selabel_handle* sehandle, mode_t mode, uid_t uid,
secontext.reset(tmp_secontext); secontext.reset(tmp_secontext);
} }
LOG(DEBUG) << "Setting up mode " << std::oct << mode << std::dec << " uid " << uid << " gid " 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 (secontext) {
if (setfscreatecon(secontext.get()) != 0) { if (setfscreatecon(secontext.get()) != 0) {
PLOG(ERROR) << "Unable to read setfscreatecon for: " << path; PLOG(ERROR) << "Unable to read setfscreatecon for: " << path;