Fix some other occurrences

kleisauke · kleisauke · commit 85f9d974fca0 · 2024-06-18T15:05:34.000+02:00
diff --git a/libvips/iofuncs/generate.c b/libvips/iofuncs/generate.c
@@ -628,15 +628,22 @@ vips_allocate_input_array(VipsImage *out, ...)
 static int
 write_vips(VipsRegion *region, VipsRect *area, void *a)
 {
-	size_t nwritten, count;
+	size_t count;
 	void *buf;
 
 	count = (size_t) region->bpl * area->height;
 	buf = VIPS_REGION_ADDR(region, 0, area->top);
 
 	do {
-		nwritten = write(region->im->fd, buf, count);
-		if (nwritten == (size_t) -1)
+		// write() uses int not size_t on windows, so we need to chunk
+		// ... max 1gb, why not
+		int chunk_size = VIPS_MIN(1024 * 1024 * 1024, count);
+		ssize_t nwritten = write(region->im->fd, buf, chunk_size);
+
+		/* n == 0 isn't strictly an error, but we treat it as
+		 * one to make sure we don't get stuck in this loop.
+		 */
+		if (nwritten <= 0)
 			return errno;
 
 		buf = (void *) ((char *) buf + nwritten);
diff --git a/libvips/iofuncs/target.c b/libvips/iofuncs/target.c
@@ -459,9 +459,10 @@ vips_target_write_unbuffered(VipsTarget *target,
 		return 0;
 
 	while (length > 0) {
-		gint64 bytes_written;
-
-		bytes_written = class->write(target, data, length);
+		// write() uses int not size_t on windows, so we need to chunk
+		// ... max 1gb, why not
+		int chunk_size = VIPS_MIN(1024 * 1024 * 1024, length);
+		gint64 bytes_written = class->write(target, data, chunk_size);
 
 		/* n == 0 isn't strictly an error, but we treat it as
 		 * one to make sure we don't get stuck in this loop.
diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c
@@ -538,12 +538,15 @@ int
 vips__write(int fd, const void *buf, size_t count)
 {
 	do {
-		// write() uses int not ssize_t on windows, so we need to chunk
+		// write() uses int not size_t on windows, so we need to chunk
 		// ... max 1gb, why not
 		int chunk_size = VIPS_MIN(1024 * 1024 * 1024, count);
 		ssize_t nwritten = write(fd, buf, chunk_size);
 
-		if (nwritten == (ssize_t) -1) {
+		/* n == 0 isn't strictly an error, but we treat it as
+		 * one to make sure we don't get stuck in this loop.
+		 */
+		if (nwritten <= 0) {
 			vips_error_system(errno, "vips__write", "%s", _("write failed"));
 			return -1;
 		}
