diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-28 17:24:24 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-29 21:14:56 -0700 |
| commit | 2f5feedf1d705b53e5bf90c8b5207dd91f4522f1 (patch) | |
| tree | e2c357667b0e76e6fa5a43c7a7951c872c373e9c /minzip/SysUtil.c | |
| parent | f7466f9f2334b0e9025e1c7ecf65b4d04a246b20 (diff) | |
| download | bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.zip bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.tar.gz bootable_recovery-2f5feedf1d705b53e5bf90c8b5207dd91f4522f1.tar.bz2 | |
Check all lseek calls succeed.
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.
Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
(cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
Diffstat (limited to 'minzip/SysUtil.c')
| -rw-r--r-- | minzip/SysUtil.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/minzip/SysUtil.c b/minzip/SysUtil.c index ac6f5c3..b160c9e 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; } |