ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "gatekeeperd: fixed potential nullptr deref"

Browse source
This commit is contained in:
Janis Danisevskis 2019-03-18 19:24:59 +00:00 • committed by Android (Google) Code Review
commit 35c86cb4fd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gatekeeperd/gatekeeperd.cpp
View file

@ -273,7 +273,8 @@ public:
}
// can't verify if we're missing either param
if ((enrolled_password_handle_length | provided_password_length) == 0)
if (enrolled_password_handle == nullptr || provided_password == nullptr ||
enrolled_password_handle_length == 0 || provided_password_length == 0)
return -EINVAL;
int ret;
@ -322,7 +323,7 @@ public:
if (ret == 0) {
// success! re-enroll with HAL
*request_reenroll = true;
if (request_reenroll != nullptr) *request_reenroll = true;
}
}
} else {