summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaulet Zhanguzin <dauletz@google.com>2020-08-21 13:35:30 +0100
committerDaulet Zhanguzin <dauletz@google.com>2020-08-21 13:35:30 +0100
commit57da3c822d6994ed2da78cee9e2530ce263c2c75 (patch)
treedab5913a07e54f09b4c6d4b91d34c50a9f6b0480
parente182cbceda4ee8d7cd6ca7852f5953236b3f6bc0 (diff)
Fix reading large file offsets on 32-bit
No 32 bit device on hand to verify, but this fix has been verified by partner. Test: Treehugger Bug: 156027158 (cherry pick from aosp) Change-Id: Ia604e7aac6cdd1cb46d5f2bcdf7f96cb56349954 Merged-In: Ia604e7aac6cdd1cb46d5f2bcdf7f96cb56349954
-rw-r--r--ojluni/src/main/native/zip_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c
index 6c02d2bc73..aa9c5cede9 100644
--- a/ojluni/src/main/native/zip_util.c
+++ b/ojluni/src/main/native/zip_util.c
@@ -156,7 +156,7 @@ ZFILE_read(ZFILE zfd, char *buf, jint nbytes, jlong offset) {
* JVM_IO_INTR is tricky and could cause undesired side effect. So we decided
* to simply call "read" on Solaris/Linux. See details in bug 6304463.
*/
- return pread(zfd, buf, nbytes, offset);
+ return pread64(zfd, buf, nbytes, offset);
#endif
}