diff options
author | Tao Bao <tbao@google.com> | 2015-07-25 01:08:59 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 01:08:59 +0200 |
commit | 0622ccb34d504170b76b8f4dd5f0639794be679a (patch) | |
tree | 723d758c21e1a5f84664436a5b431fd629ad28b3 | |
parent | am dd738c11: Merge "applypatch: Support flash mode." (diff) | |
parent | Merge "applypatch: Fix the checking in WriteToPartition()." (diff) | |
download | android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar.gz android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar.bz2 android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar.lz android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar.xz android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.tar.zst android_bootable_recovery-0622ccb34d504170b76b8f4dd5f0639794be679a.zip |
-rw-r--r-- | applypatch/applypatch.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 2446b2a68..751d3e392 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -312,13 +312,14 @@ int SaveFileContents(const char* filename, const FileContents* file) { } // Write a memory buffer to 'target' partition, a string of the form -// "MTD:<partition>[:...]" or "EMMC:<partition_device>". Return 0 on -// success. +// "MTD:<partition>[:...]" or "EMMC:<partition_device>[:...]". The target name +// 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) { std::string copy(target); 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); return -1; } |