diff options
| author | Piotr Jastrzebski <haaawk@google.com> | 2014-08-15 12:53:00 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-08-26 13:48:44 +0100 |
| commit | 0c1b894b69ff1261f14bad616d8a4ddada186a0d (patch) | |
| tree | d22b8f906afa24f61c1524a9476321a87e01301f /libziparchive | |
| parent | a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8 (diff) | |
| download | system_core-0c1b894b69ff1261f14bad616d8a4ddada186a0d.zip system_core-0c1b894b69ff1261f14bad616d8a4ddada186a0d.tar.gz system_core-0c1b894b69ff1261f14bad616d8a4ddada186a0d.tar.bz2 | |
Reject zip archives with entry names containing \0.
There should never be a need of an entry name with \0 character.
Bug: 16162465
(cherry picked from commit 78271ba97b5d867e3597b7fc2257dd1bbd513b05)
Change-Id: I68c72fb45e8ec70eb125cfc887488bc18ba5447d
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/zip_archive.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index 6ec8f0d..87dac0e 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -638,9 +638,15 @@ static int32_t ParseZipArchive(ZipArchive* archive) { const uint16_t file_name_length = cdr->file_name_length; const uint16_t extra_length = cdr->extra_field_length; const uint16_t comment_length = cdr->comment_length; + const char* file_name = reinterpret_cast<const char*>(ptr + sizeof(CentralDirectoryRecord)); + + /* check that file name doesn't contain \0 character */ + if (memchr(file_name, 0, file_name_length) != NULL) { + ALOGW("Zip: entry name can't contain \\0 character"); + goto bail; + } /* add the CDE filename to the hash table */ - const char* file_name = reinterpret_cast<const char *>(ptr + sizeof(CentralDirectoryRecord)); const int add_result = AddToHash(archive->hash_table, archive->hash_table_size, file_name, file_name_length); if (add_result) { |