提交: fa7ec37be7dfef8e1dc57ebfd594cd23c3c2af3a - system-core (git)

system/core

Commit MetaInfo

• 修订版: fa7ec37be7dfef8e1dc57ebfd594cd23c3c2af3a (tree)
• 时间: 2017-03-24 00:07:51
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 6.0.1 release 79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAli9mHkACgkQ6K0/gZqxDnjJzwCfdLnOgzlCeqTikEsRCvcfNP1G
XiQAnj3Ke5sG1GzRQ2mecIqAt8EYTxcA
=KoHF
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r79' into marshmallow-x86

Android 6.0.1 release 79

更改概述

• modified: libziparchive/zip_archive.cc

差异

--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -463,9 +463,14 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name,
    * Grab the CD offset and size, and the number of entries in the
    * archive and verify that they look reasonable.
    */
-  if (eocd->cd_start_offset + eocd->cd_size > eocd_offset) {
+  if (static_cast<off64_t>(eocd->cd_start_offset) + eocd->cd_size > eocd_offset) {
     ALOGW("Zip: bad offsets (dir %" PRIu32 ", size %" PRIu32 ", eocd %" PRId64 ")",
         eocd->cd_start_offset, eocd->cd_size, static_cast<int64_t>(eocd_offset));
+#if defined(__ANDROID__)
+    if (eocd->cd_start_offset + eocd->cd_size <= eocd_offset) {
+      android_errorWriteLog(0x534e4554, "31251826");
+    }
+#endif
     return kInvalidOffset;
   }
   if (eocd->num_records == 0) {