summaryrefslogtreecommitdiffstats
path: root/minzip/SysUtil.c
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-30 06:11:41 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-30 06:11:41 +0200
commit34c7731a0bb296a1289b85a83f53026117aa3677 (patch)
treee2c357667b0e76e6fa5a43c7a7951c872c373e9c /minzip/SysUtil.c
parentMerge "Stop using adb_strtok, and check argument validity." (diff)
parentCheck all lseek calls succeed. (diff)
downloadandroid_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar.gz
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar.bz2
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar.lz
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar.xz
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.tar.zst
android_bootable_recovery-34c7731a0bb296a1289b85a83f53026117aa3677.zip
Diffstat (limited to 'minzip/SysUtil.c')
-rw-r--r--minzip/SysUtil.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/minzip/SysUtil.c b/minzip/SysUtil.c
index ac6f5c33f..b160c9e3d 100644
--- a/minzip/SysUtil.c
+++ b/minzip/SysUtil.c
@@ -27,11 +27,13 @@ static int getFileStartAndLength(int fd, off_t *start_, size_t *length_)
assert(start_ != NULL);
assert(length_ != NULL);
- start = lseek(fd, 0L, SEEK_CUR);
- end = lseek(fd, 0L, SEEK_END);
- (void) lseek(fd, start, SEEK_SET);
+ // TODO: isn't start always 0 for the single call site? just use fstat instead?
- if (start == (off_t) -1 || end == (off_t) -1) {
+ start = TEMP_FAILURE_RETRY(lseek(fd, 0L, SEEK_CUR));
+ end = TEMP_FAILURE_RETRY(lseek(fd, 0L, SEEK_END));
+
+ if (TEMP_FAILURE_RETRY(lseek(fd, start, SEEK_SET)) == -1 ||
+ start == (off_t) -1 || end == (off_t) -1) {
LOGE("could not determine length of file\n");
return -1;
}