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

am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."

Browse Source 
* commit '6a4a33e39ea2fa8626335f6b9cccf407c71c0588':
  applypatch: Fix the checking in WriteToPartition().
This commit is contained in:
Tao Bao
2015-07-24 23:08:59 +00:00
committed by Android Git Automerger
parent 3b753ad5da 6a4a33e39e
commit 0622ccb34d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/applypatch.cpp
+4 -3
View File
@@ -312,13 +312,14 @@ int SaveFileContents(const char* filename, const FileContents* file) {
} }
// Write a memory buffer to 'target' partition, a string of the form // Write a memory buffer to 'target' partition, a string of the form
// "MTD:<partition>[:...]" or "EMMC:<partition_device>". Return 0 on // "MTD:<partition>[:...]" or "EMMC:<partition_device>[:...]". The target name
// success. // might contain multiple colons, but WriteToPartition() only uses the first
// two and ignores the rest. Return 0 on success.
int WriteToPartition(unsigned char* data, size_t len, const char* target) { int WriteToPartition(unsigned char* data, size_t len, const char* target) {
std::string copy(target); std::string copy(target);
std::vector<std::string> pieces = android::base::Split(copy, ":"); std::vector<std::string> pieces = android::base::Split(copy, ":");
if (pieces.size() != 2) { if (pieces.size() < 2) {
printf("WriteToPartition called with bad target (%s)\n", target); printf("WriteToPartition called with bad target (%s)\n", target);
return -1; return -1;
} }