tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix full-eng build breakage due to dbacd826a100f2c."

Browse source 
This reverts commit 6e39c88b1e.

This change should not have automerged to nyc-dev. Still investigating
why that's the case.

Test: make
This commit is contained in:
Narayan Kamath 2017-10-04 18:23:09 +01:00
parent a76b9888aa
commit d5715c5d2d
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libziparchive/zip_archive_test.cc
View file

@ -613,7 +613,7 @@ TEST(ziparchive, StreamUncompressedBadCrc) {
// Manual changes :
// [2] = 0xff // Corrupt the LFH signature of entry 0.
// [3] = 0xff // Corrupt the LFH signature of entry 0.
static const uint8_t kZipFileWithBrokenLfhSignature[] = {
static const std::vector<uint8_t> kZipFileWithBrokenLfhSignature{
//[lfh-sig-----------], [lfh contents---------------------------------
0x50, 0x4b, 0xff, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x80,
//--------------------------------------------------------------------
@ -644,16 +644,12 @@ static const uint8_t kZipFileWithBrokenLfhSignature[] = {
0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00};
TEST(ziparchive, BrokenLfhSignature) {
char kTempFilePattern[] = "zip_archive_input_XXXXXX";
int fd = make_temporary_file(kTempFilePattern);
ASSERT_NE(-1, fd);
ASSERT_EQ(static_cast<int32_t>(sizeof(kZipFileWithBrokenLfhSignature)),
TEMP_FAILURE_RETRY(write(fd, kZipFileWithBrokenLfhSignature,
sizeof(kZipFileWithBrokenLfhSignature))));
TemporaryFile tmp_file;
ASSERT_NE(-1, tmp_file.fd);
ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, &kZipFileWithBrokenLfhSignature[0],
kZipFileWithBrokenLfhSignature.size()));
ZipArchiveHandle handle;
ASSERT_EQ(-1, OpenArchiveFd(fd, "LeadingNonZipBytes", &handle));
close(fd);
ASSERT_EQ(-1, OpenArchiveFd(tmp_file.fd, "LeadingNonZipBytes", &handle));
}
int main(int argc, char** argv) {