diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-30 06:19:33 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 06:19:33 +0200 |
| commit | 34d3a3d074e977cace29797c428795e1de5b3223 (patch) | |
| tree | e2c357667b0e76e6fa5a43c7a7951c872c373e9c /minzip/SysUtil.c | |
| parent | am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity." (diff) | |
| parent | Merge "Check all lseek calls succeed." (diff) | |
| download | android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.gz android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.bz2 android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.lz android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.xz android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.tar.zst android_bootable_recovery-34d3a3d074e977cace29797c428795e1de5b3223.zip | |
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 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; } |