summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-07-25 00:29:12 +0200
committerRom Lemarchand <romlem@google.com>2015-11-16 23:28:40 +0100
commit32ac97675bade3681203c46d001f76b11a359fd5 (patch)
treeb5a9da9a8592b7701caf8b6867b4cb0d487864d7
parentapplypatch: Support flash mode. (diff)
downloadandroid_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar.gz
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar.bz2
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar.lz
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar.xz
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.tar.zst
android_bootable_recovery-32ac97675bade3681203c46d001f76b11a359fd5.zip
Diffstat (limited to '')
-rw-r--r--applypatch/applypatch.cpp7
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;
}