Fix segfault with ZIP module on some files, code review