Merge "Reject zip archives with entry names containing \0."

    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 uint8_t* file_name = 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 uint8_t* file_name = ptr + sizeof(CentralDirectoryRecord);

    ZipEntryName entry_name;

    entry_name.name = file_name;

    entry_name.name_length = file_name_length;