Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-core: Commit

system/core


Commit MetaInfo

Revisiónfa7ec37be7dfef8e1dc57ebfd594cd23c3c2af3a (tree)
Tiempo2017-03-24 00:07:51
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-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

Cambiar Resumen

Diferencia

--- 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,
463463 * Grab the CD offset and size, and the number of entries in the
464464 * archive and verify that they look reasonable.
465465 */
466- if (eocd->cd_start_offset + eocd->cd_size > eocd_offset) {
466+ if (static_cast<off64_t>(eocd->cd_start_offset) + eocd->cd_size > eocd_offset) {
467467 ALOGW("Zip: bad offsets (dir %" PRIu32 ", size %" PRIu32 ", eocd %" PRId64 ")",
468468 eocd->cd_start_offset, eocd->cd_size, static_cast<int64_t>(eocd_offset));
469+#if defined(__ANDROID__)
470+ if (eocd->cd_start_offset + eocd->cd_size <= eocd_offset) {
471+ android_errorWriteLog(0x534e4554, "31251826");
472+ }
473+#endif
469474 return kInvalidOffset;
470475 }
471476 if (eocd->num_records == 0) {
Show on old repository browser