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

recovery: Fix the argument parsing from COMMAND_FILE.

Browse Source 
Commit f0ed159f48 didn't ensure mounting
COMMAND_FILE (i.e. /cache) prior to reading. Also the first argument in
COMMAND_FILE should not be dropped (unlike the first "recovery" argument
in BCB message).

Bug: 33431888
Test: Push /cache/recovery/command and recovery imag parses the
      arguments successfully.

Change-Id: Ica3157a0bb03a2355315123354617eaf3fff15a4
This commit is contained in:
Tao Bao
2016-12-08 18:10:48 -08:00
parent 3aadbbac39
commit 7d34fa17ab
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+5 -2
View File
@@ -350,9 +350,12 @@ static std::vector<std::string> get_args(const int argc, char** const argv) {
// --- if that doesn't work, try the command file (if we have /cache).
if (argc == 1 && has_cache) {
std::string content;
if (android::base::ReadFileToString(COMMAND_FILE, &content)) {
if (ensure_path_mounted(COMMAND_FILE) == 0 &&
android::base::ReadFileToString(COMMAND_FILE, &content)) {
std::vector<std::string> tokens = android::base::Split(content, "\n");
for (auto it = tokens.begin() + 1; it != tokens.end(); it++) {
// All the arguments in COMMAND_FILE are needed (unlike the BCB message,
// COMMAND_FILE doesn't use filename as the first argument).
for (auto it = tokens.begin(); it != tokens.end(); it++) {
// Skip empty and '\0'-filled tokens.
if (!it->empty() && (*it)[0] != '\0') args.push_back(std::move(*it));
}