PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "uncrypt: avoid use-after-free"

Browse Source 
am: 0305fcecc5

* commit '0305fcecc5b1a9f8172ca1753a29b6963e7bb474':
  uncrypt: avoid use-after-free
This commit is contained in:
Tao Bao
2016-01-14 02:05:31 +00:00
committed by android-build-merger
parent 2d127a1d4a 0305fcecc5
commit 4edfeb84dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uncrypt/uncrypt.cpp
+4 -3
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) {
const char* input_path;
const char* map_file;
if (argc != 3 && argc != 1 && (argc == 2 && strcmp(argv[1], "--reboot") != 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);
std::string package;
const char* input_path;
const char* map_file;
if (argc == 3) {
// when command-line args are given this binary is being used
// for debugging.
input_path = argv[1];
map_file = argv[2];
} else {
std::string package;
if (!find_uncrypt_package(package)) {
android::base::WriteStringToFd("-1\n", status_fd);
return 1;