openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 78271ba97b)

Change-Id: I68c72fb45e8ec70eb125cfc887488bc18ba5447d
This commit is contained in:
Piotr Jastrzebski 2014-08-15 12:53:00 +01:00 committed by Narayan Kamath
parent a005e7795e
commit 0c1b894b69
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libziparchive/zip_archive.cc
View File

@ -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) {