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

Commit 69b259cc authored by Tianjie's avatar Tianjie Committed by Automerger Merge Worker
Browse files

Handle the invalid timestamp in zipfile am: abf60c8d 

Change-Id: I0dc212fd60248ab80309c58d526e402bb0478735
parents cc219de9 abf60c8d

libziparchive/include/ziparchive/zip_archive.h

+3 −2
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ struct ZipEntry { 
  // Modification time. The zipfile format specifies

  // that the first two little endian bytes contain the time

  // and the last two little endian bytes contain the date.

  // See `GetModificationTime`.

  // See `GetModificationTime`. Use signed integer to avoid the

  // sub-overflow.

  // TODO: should be overridden by extra time field, if present.

  uint32_t mod_time;

  int32_t mod_time;



  // Returns `mod_time` as a broken-down struct tm.

  struct tm GetModificationTime() const;

libziparchive/zip_archive.cc

+1 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,7 @@ bool ZipArchive::InitializeCentralDirectory(off64_t cd_start_offset, size_t cd_s 
  return true;

}



// This function returns the embedded timestamp as is; and doesn't perform validations.

tm ZipEntry::GetModificationTime() const {

  tm t = {};