Commit 104771e5 authored Mar 21, 2019 by Nick Kralevich

zip_archive.cc: delete android_errorWriteLog

The process of determining whether or not to emit a safetynet error
entry while processing a malformed file relies on addition overflow.
Since this is only logging, and logging which isn't used, delete the
code instead of trying to fix the logic which is causing the integer
overflow.

This change is necessary to enable integer sanitization on this code.

Somewhat related to Bug: 122975762
Test: atest ziparchive-tests

Change-Id: I6b41ccf7881348cb4e5236324eaa44a05662a725

parent b4ef0beb

libziparchive/zip_archive.cc

+0 −5

Original line number	Diff line number	Diff line
		@@ -278,11 +278,6 @@ static int32_t MapCentralDirectory0(const char* debug_file_name, ZipArchive* arc
		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) {