Merge "Fix out of bound read in libziparchive"