| Révision | fa7ec37be7dfef8e1dc57ebfd594cd23c3c2af3a (tree) |
|---|---|
| l'heure | 2017-03-24 00:07:51 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-6.0.1_r79' into marshmallow-x86
Android 6.0.1 release 79
libziparchive/zip_archive.cc (diff)| @@ -463,9 +463,14 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name, | ||
| 463 | 463 | * Grab the CD offset and size, and the number of entries in the |
| 464 | 464 | * archive and verify that they look reasonable. |
| 465 | 465 | */ |
| 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) { | |
| 467 | 467 | ALOGW("Zip: bad offsets (dir %" PRIu32 ", size %" PRIu32 ", eocd %" PRId64 ")", |
| 468 | 468 | 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 | |
| 469 | 474 | return kInvalidOffset; |
| 470 | 475 | } |
| 471 | 476 | if (eocd->num_records == 0) { |
Android-x86
Fork