Merge "Fix out of bound access in libziparchive"