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

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

Revert "Fix full-eng build breakage due to dbacd826." am: d5715c5d... 

Revert "Fix full-eng build breakage due to dbacd826." am: d5715c5d am: c6b5b671 am: f9b3f6b9
am: 18330888

Change-Id: Iaa70f715aaa3dd8ff6e0f2a65afe5a11505debf2
parents 752ab47b 18330888

libziparchive/zip_archive_test.cc

+6 −10
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ TEST(ziparchive, StreamUncompressedBadCrc) { 
// Manual changes :

// [2] = 0xff  // Corrupt the LFH signature of entry 0.

// [3] = 0xff  // Corrupt the LFH signature of entry 0.

static const uint8_t kZipFileWithBrokenLfhSignature[] = {

static const std::vector<uint8_t> kZipFileWithBrokenLfhSignature{

    //[lfh-sig-----------], [lfh contents---------------------------------

    0x50, 0x4b, 0xff, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x80,

    //--------------------------------------------------------------------
@@ -644,16 +644,12 @@ static const uint8_t kZipFileWithBrokenLfhSignature[] = { 
    0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00};



TEST(ziparchive, BrokenLfhSignature) {

  char kTempFilePattern[] = "zip_archive_input_XXXXXX";

  int fd = make_temporary_file(kTempFilePattern);

  ASSERT_NE(-1, fd);



  ASSERT_EQ(static_cast<int32_t>(sizeof(kZipFileWithBrokenLfhSignature)),

      TEMP_FAILURE_RETRY(write(fd, kZipFileWithBrokenLfhSignature,

                               sizeof(kZipFileWithBrokenLfhSignature))));

  TemporaryFile tmp_file;

  ASSERT_NE(-1, tmp_file.fd);

  ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, &kZipFileWithBrokenLfhSignature[0],

                                        kZipFileWithBrokenLfhSignature.size()));

  ZipArchiveHandle handle;

  ASSERT_EQ(-1, OpenArchiveFd(fd, "LeadingNonZipBytes", &handle));

  close(fd);

  ASSERT_EQ(-1, OpenArchiveFd(tmp_file.fd, "LeadingNonZipBytes", &handle));

}



int main(int argc, char** argv) {