X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=exfat2img%2Fexfat2img.c;h=3f835889ad6baacc02dc9cf9b29ac5fd2c2b797f;hb=fa2bead8d3f2203fb7b22d801443109a52808490;hp=81e86d2f12b4da5132e9b1e5b6fe54bcba53d104;hpb=03290761e3849db9b13d2d3b176b36ab31c395bb;p=sven%2Fexfatprogs.git

diff --git a/exfat2img/exfat2img.c b/exfat2img/exfat2img.c
index 81e86d2..3f83588 100644
--- a/exfat2img/exfat2img.c
+++ b/exfat2img/exfat2img.c
@@ -319,7 +319,7 @@ static int read_file_dentry_set(struct exfat_de_iter *iter,
 	if (!node)
 		return -ENOMEM;
 
-	for (i = 2; i <= file_de->file_num_ext; i++) {
+	for (i = 2; i <= MIN(file_de->file_num_ext, 1 + MAX_NAME_DENTRIES); i++) {
 		ret = exfat_de_iter_get(iter, i, &dentry);
 		if (ret || dentry->type != EXFAT_NAME)
 			break;
@@ -754,7 +754,7 @@ static ssize_t read_stream(int fd, void *buf, size_t len)
 		} else if (ret == 0) {
 			return 0;
 		}
-		buf += (size_t)ret;
+		buf = (char *)buf + (size_t)ret;
 		read_len += (size_t)ret;
 	}
 	return read_len;