tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb

Browse source 
am: 0ae9d80082

Change-Id: Ia1fbd7e0352bb34a835e2e68593c464b555f41df
This commit is contained in:
Tianjie Xu 2016-09-01 18:01:09 +00:00 committed by android-build-merger
commit 28f6c43db5
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
applypatch/applypatch.cpp
View file

@ -336,6 +336,9 @@ int WriteToPartition(const unsigned char* data, size_t len, const char* target)
printf("verify read error %s at %zu: %s\n",
partition, p, strerror(errno));
return -1;
} else if (read_count == 0) {
printf("verify read reached unexpected EOF, %s at %zu\n", partition, p);
return -1;
}
if (static_cast<size_t>(read_count) < to_read) {
printf("short verify read %s at %zu: %zd %zu %s\n",

13
fuse_sdcard_provider.cpp
View file

@ -23,6 +23,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <android-base/file.h>
#include "fuse_sideload.h"
struct file_data {
@ -41,14 +43,9 @@ static int read_block_file(void* cookie, uint32_t block, uint8_t* buffer, uint32
return -EIO;
}
while (fetch_size > 0) {
ssize_t r = TEMP_FAILURE_RETRY(read(fd->fd, buffer, fetch_size));
if (r == -1) {
fprintf(stderr, "read on sdcard failed: %s\n", strerror(errno));
return -EIO;
}
fetch_size -= r;
buffer += r;
if (!android::base::ReadFully(fd->fd, buffer, fetch_size)) {
fprintf(stderr, "read on sdcard failed: %s\n", strerror(errno));
return -EIO;
}
return 0;

4
updater/blockimg.cpp
View file

@ -151,6 +151,10 @@ static int read_all(int fd, uint8_t* data, size_t size) {
failure_type = kFreadFailure;
fprintf(stderr, "read failed: %s\n", strerror(errno));
return -1;
} else if (r == 0) {
failure_type = kFreadFailure;
fprintf(stderr, "read reached unexpected EOF.\n");
return -1;
}
so_far += r;
}