From ceb66b133f94d9db1a637e6dde9bcbe81c36cff1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 2 Mar 2023 20:38:59 -0800
Subject: [PATCH] VFS: Improve zip invariant handling

---
 src/util/vfs/vfs-zip.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/vfs/vfs-zip.c b/src/util/vfs/vfs-zip.c
index 2f8234b94..65e1c1e32 100644
--- a/src/util/vfs/vfs-zip.c
+++ b/src/util/vfs/vfs-zip.c
@@ -309,6 +309,9 @@ ssize_t _vfzRead(struct VFile* vf, void* buffer, size_t size) {
 	if (!vfz->buffer) {
 		vfz->bufferSize = BLOCK_SIZE;
 		vfz->buffer = malloc(BLOCK_SIZE);
+		if (vfz->readSize) {
+			abort();
+		}
 	}
 
 	while (bytesRead < size) {
@@ -714,7 +717,7 @@ struct VFile* _vdzOpenFile(struct VDir* vd, const char* path, int mode) {
 		}
 	}
 
-	struct VFileZip* vfz = malloc(sizeof(struct VFileZip));
+	struct VFileZip* vfz = calloc(1, sizeof(struct VFileZip));
 	vfz->uz = vdz->uz;
 	vfz->z = vdz->z;
 	vfz->buffer = 0;