diff options
author | Tao Bao <tbao@google.com> | 2015-07-25 00:56:36 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-25 00:56:36 +0200 |
commit | 6a4a33e39ea2fa8626335f6b9cccf407c71c0588 (patch) | |
tree | 723d758c21e1a5f84664436a5b431fd629ad28b3 | |
parent | Merge "applypatch: Support flash mode." (diff) | |
parent | applypatch: Fix the checking in WriteToPartition(). (diff) | |
download | android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar.gz android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar.bz2 android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar.lz android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar.xz android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.tar.zst android_bootable_recovery-6a4a33e39ea2fa8626335f6b9cccf407c71c0588.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; } |