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/Zip.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/Zip.c')
-rw-r--r-- | minzip/Zip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index d3ff79b..40712e0 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -675,13 +675,11 @@ static bool writeProcessFunction(const unsigned char *data, int dataLen, } ssize_t soFar = 0; while (true) { - ssize_t n = write(fd, data+soFar, dataLen-soFar); + ssize_t n = TEMP_FAILURE_RETRY(write(fd, data+soFar, dataLen-soFar)); if (n <= 0) { LOGE("Error writing %zd bytes from zip file from %p: %s\n", dataLen-soFar, data+soFar, strerror(errno)); - if (errno != EINTR) { - return false; - } + return false; } else if (n > 0) { soFar += n; if (soFar == dataLen) return true; |