summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-12-17 21:11:47 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-17 21:11:47 +0100
commit9da1880118c58e45543d9f3b2356e9f833582c9a (patch)
tree0496e3ff94041561e9235f6be08235195cbd836e /minzip
parentam 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge (diff)
parentMerge "Pass the correct pointer to munmap on failure." (diff)
downloadandroid_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar.gz
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar.bz2
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar.lz
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar.xz
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.tar.zst
android_bootable_recovery-9da1880118c58e45543d9f3b2356e9f833582c9a.zip
Diffstat (limited to 'minzip')
-rw-r--r--minzip/SysUtil.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/minzip/SysUtil.c b/minzip/SysUtil.c
index 49a2522d6..31c76d6d4 100644
--- a/minzip/SysUtil.c
+++ b/minzip/SysUtil.c
@@ -95,16 +95,16 @@ int sysLoadFileInShmem(int fd, MemMapping* pMap)
if (memPtr == NULL)
return -1;
- actual = read(fd, memPtr, length);
+ pMap->baseAddr = pMap->addr = memPtr;
+ pMap->baseLength = pMap->length = length;
+
+ actual = TEMP_FAILURE_RETRY(read(fd, memPtr, length));
if (actual != length) {
LOGE("only read %d of %d bytes\n", (int) actual, (int) length);
sysReleaseShmem(pMap);
return -1;
}
- pMap->baseAddr = pMap->addr = memPtr;
- pMap->baseLength = pMap->length = length;
-
return 0;
}