Fix out of bound read in libziparchive am: d9fd1863f4 (25c0d68d) · Commits · e / os / android_system_core

libziparchive/zip_archive.cc

+8 −5

Original line number	Diff line number	Diff line
		@@ -580,6 +580,14 @@ static int32_t ParseZipArchive(ZipArchive* archive) {
		const uint8_t* const cd_end = cd_ptr + cd_length;
		const uint8_t* ptr = cd_ptr;
		for (uint16_t i = 0; i < num_entries; i++) {
		if (ptr > cd_end - sizeof(CentralDirectoryRecord)) {
		ALOGW("Zip: ran off the end (at %" PRIu16 ")", i);
		#if defined(__ANDROID__)
		android_errorWriteLog(0x534e4554, "36392138");
		#endif
		return -1;
		}

		const CentralDirectoryRecord* cdr =
		reinterpret_cast<const CentralDirectoryRecord*>(ptr);
		if (cdr->record_signature != CentralDirectoryRecord::kSignature) {
		@@ -587,11 +595,6 @@ static int32_t ParseZipArchive(ZipArchive* archive) {
		return -1;
		}

		if (ptr + sizeof(CentralDirectoryRecord) > cd_end) {
		ALOGW("Zip: ran off the end (at %" PRIu16 ")", i);
		return -1;
		}

		const off64_t local_header_offset = cdr->local_file_header_offset;
		if (local_header_offset >= archive->directory_offset) {
		ALOGW("Zip: bad LFH offset %" PRId64 " at entry %" PRIu16,