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

Merge "uncrypt: avoid use-after-free"

Browse source
This commit is contained in:
Tao Bao 2016-01-14 00:41:04 +00:00 committed by Gerrit Code Review
commit 0305fcecc5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
uncrypt/uncrypt.cpp
View file

@ -418,8 +418,6 @@ int uncrypt(const char* input_path, const char* map_file, int status_fd) {
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
const char* input_path;
const char* map_file;
if (argc != 3 && argc != 1 && (argc == 2 && strcmp(argv[1], "--reboot") != 0)) { if (argc != 3 && argc != 1 && (argc == 2 && strcmp(argv[1], "--reboot") != 0)) {
fprintf(stderr, "usage: %s [--reboot] [<transform_path> <map_file>]\n", argv[0]); fprintf(stderr, "usage: %s [--reboot] [<transform_path> <map_file>]\n", argv[0]);
@ -443,13 +441,16 @@ int main(int argc, char** argv) {
} }
unique_fd status_fd_holder(status_fd); unique_fd status_fd_holder(status_fd);
std::string package;
const char* input_path;
const char* map_file;
if (argc == 3) { if (argc == 3) {
// when command-line args are given this binary is being used // when command-line args are given this binary is being used
// for debugging. // for debugging.
input_path = argv[1]; input_path = argv[1];
map_file = argv[2]; map_file = argv[2];
} else { } else {
std::string package;
if (!find_uncrypt_package(package)) { if (!find_uncrypt_package(package)) {
android::base::WriteStringToFd("-1\n", status_fd); android::base::WriteStringToFd("-1\n", status_fd);
return 1; return 1;