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

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

Merge "libziparchive: verify that gpb flags match" into oc-dev 

am: 91e3f638

Change-Id: I4b3f7e5845779c94d42c7e78548ed2e085619990
parents e3a75840 91e3f638

libziparchive/zip_archive.cc

+3 −3
Original line number Diff line number Diff line
@@ -574,9 +574,9 @@ static int32_t FindEntry(const ZipArchive* archive, const int ent, 
  // Paranoia: Match the values specified in the local file header

  // to those specified in the central directory.



  // Verify that the central directory and local file header agree on the use of a trailing

  // Data Descriptor.

  if ((lfh->gpb_flags & kGPBDDFlagMask) != (cdr->gpb_flags & kGPBDDFlagMask)) {

  // Verify that the central directory and local file header have the same general purpose bit

  // flags set.

  if (lfh->gpb_flags != cdr->gpb_flags) {

    ALOGW("Zip: gpb flag mismatch. expected {%04" PRIx16 "}, was {%04" PRIx16 "}",

          cdr->gpb_flags, lfh->gpb_flags);

    return kInconsistentInformation;