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

Commit dfa10ee4 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "libziparchive: fix calculation of mod_time." 

am: b57cd145

* commit 'b57cd145':
  libziparchive: fix calculation of mod_time.
parents 9d4203aa b57cd145

libziparchive/zip_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int32_t FindEntry(const ZipArchive* archive, const int ent, 
  // and other interesting attributes from the central directory. These

  // will later be compared against values from the local file header.

  data->method = cdr->compression_method;

  data->mod_time = cdr->last_mod_time;

  data->mod_time = cdr->last_mod_date << 16 | cdr->last_mod_time;

  data->crc32 = cdr->crc32;

  data->compressed_length = cdr->compressed_size;

  data->uncompressed_length = cdr->uncompressed_size;

libziparchive/zip_archive_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ TEST(ziparchive, FindEntry) { 
  ASSERT_EQ(static_cast<uint32_t>(17), data.uncompressed_length);

  ASSERT_EQ(static_cast<uint32_t>(13), data.compressed_length);

  ASSERT_EQ(0x950821c5, data.crc32);

  ASSERT_EQ(static_cast<uint32_t>(0x438a8005), data.mod_time);



  // An entry that doesn't exist. Should be a negative return code.

  ZipString absent_name;