Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbb6e057 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

libziparchive: ensure ReadAtOffset is atomic 

am: b1911401

* commit 'b1911401':
  libziparchive: ensure ReadAtOffset is atomic
parents 0ebfd449 b1911401

include/ziparchive/zip_archive.h

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ void CloseArchive(ZipArchiveHandle handle); 
 * if this file entry contains a data descriptor footer. To verify crc32s

 * and length, a call to VerifyCrcAndLengths must be made after entry data

 * has been processed.

 *

 * On non-Windows platforms this method does not modify internal state and

 * can be called concurrently.

 */

int32_t FindEntry(const ZipArchiveHandle handle, const ZipString& entryName,

                  ZipEntry* data);

libziparchive/zip_archive.cc

+8 −2
Original line number Diff line number Diff line
@@ -495,14 +495,20 @@ static int32_t UpdateEntryFromDataDescriptor(int fd, 
}



// Attempts to read |len| bytes into |buf| at offset |off|.

// Callers should not rely on the |fd| offset being incremented

// as a side effect of this call.

// On non-Windows platforms, callers are guaranteed that the |fd|

// offset is unchanged and there is no side effect to this call.

//

// On Windows platforms this is not thread-safe.

static inline bool ReadAtOffset(int fd, uint8_t* buf, size_t len, off64_t off) {

#if !defined(_WIN32)

  return TEMP_FAILURE_RETRY(pread64(fd, buf, len, off));

#else

  if (lseek64(fd, off, SEEK_SET) != off) {

    ALOGW("Zip: failed seek to offset %" PRId64, off);

    return false;

  }

  return android::base::ReadFully(fd, buf, len);

#endif

}



static int32_t FindEntry(const ZipArchive* archive, const int ent,