summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-04-28 20:03:23 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-04-28 20:03:24 +0200
commit5443072c3ce2c1364a8a57189917dfbce9f85cf4 (patch)
treedde2231c8385d31de1d0db7d52bd4de4368a2163
parentMerge "Adding support for quiescent reboot to recovery" (diff)
parentFix potential OOM in update_verifier (diff)
downloadandroid_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar.gz
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar.bz2
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar.lz
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar.xz
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.tar.zst
android_bootable_recovery-5443072c3ce2c1364a8a57189917dfbce9f85cf4.zip
-rw-r--r--update_verifier/update_verifier.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index 1950cbd83..fdbcfde56 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -44,6 +44,7 @@
#include <string.h>
#include <unistd.h>
+#include <algorithm>
#include <string>
#include <vector>
@@ -142,17 +143,21 @@ static bool read_blocks(const std::string& partition, const std::string& range_s
return false;
}
- static constexpr int BLOCKSIZE = 4096;
+ static constexpr size_t BLOCKSIZE = 4096;
if (lseek64(fd.get(), static_cast<off64_t>(range_start) * BLOCKSIZE, SEEK_SET) == -1) {
PLOG(ERROR) << "lseek to " << range_start << " failed";
return false;
}
- size_t size = (range_end - range_start) * BLOCKSIZE;
- std::vector<uint8_t> buf(size);
- if (!android::base::ReadFully(fd.get(), buf.data(), size)) {
- PLOG(ERROR) << "Failed to read blocks " << range_start << " to " << range_end;
- return false;
+ size_t remain = (range_end - range_start) * BLOCKSIZE;
+ while (remain > 0) {
+ size_t to_read = std::min(remain, 1024 * BLOCKSIZE);
+ std::vector<uint8_t> buf(to_read);
+ if (!android::base::ReadFully(fd.get(), buf.data(), to_read)) {
+ PLOG(ERROR) << "Failed to read blocks " << range_start << " to " << range_end;
+ return false;
+ }
+ remain -= to_read;
}
blk_count += (range_end - range_start);
}