X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=829c41c963a7d6b396fecebef6a81d24e59632d7;hb=f24f8409b041727329e980fdc81e84a7c9b00e5b;hp=d154fa9a710a2c6e0a23fb8a4e8b2c2f883fb6bf;hpb=0ab938cc9554f3d5c6835c14b9177823e0e9b7bb;p=wimlib

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index d154fa9a..829c41c9 100644
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -78,6 +78,7 @@ int
 read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
 		      u64 size,
 		      consume_data_callback_t cb,
+		      u32 in_chunk_size,
 		      void *ctx_or_buf,
 		      int _ignored_flags)
 {
@@ -88,6 +89,7 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
 	s64 pos;
 	s64 bytes_remaining;
 	void *out_buf;
+	bool out_buf_malloced;
 	int ret;
 
  	ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
@@ -103,30 +105,44 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
 		goto out_close_ntfs_inode;
 	}
 
-	if (cb)
-		out_buf = alloca(WIM_CHUNK_SIZE);
-	else
+	out_buf_malloced = false;
+	if (cb) {
+		if (in_chunk_size <= STACK_MAX) {
+			out_buf = alloca(in_chunk_size);
+		} else {
+			out_buf = MALLOC(in_chunk_size);
+			if (out_buf == NULL) {
+				ret = WIMLIB_ERR_NOMEM;
+				goto out_close_ntfs_attr;
+			}
+			out_buf_malloced = true;
+		}
+	} else {
 		out_buf = ctx_or_buf;
+	}
 	pos = (loc->is_reparse_point) ? 8 : 0;
 	bytes_remaining = size;
 	while (bytes_remaining) {
-		s64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE);
+		s64 to_read = min(bytes_remaining, in_chunk_size);
 		if (ntfs_attr_pread(na, pos, to_read, out_buf) != to_read) {
 			ERROR_WITH_ERRNO("Error reading \"%"TS"\"", loc->path);
 			ret = WIMLIB_ERR_NTFS_3G;
-			goto out_close_ntfs_attr;
+			goto out_free_memory;
 		}
 		pos += to_read;
 		bytes_remaining -= to_read;
 		if (cb) {
 			ret = cb(out_buf, to_read, ctx_or_buf);
 			if (ret)
-				goto out_close_ntfs_attr;
+				goto out_free_memory;
 		} else {
 			out_buf += to_read;
 		}
 	}
 	ret = 0;
+out_free_memory:
+	if (out_buf_malloced)
+		FREE(out_buf);
 out_close_ntfs_attr:
 	ntfs_attr_close(na);
 out_close_ntfs_inode:
@@ -242,14 +258,14 @@ capture_ntfs_streams(struct wim_inode *inode,
 					goto out_free_lte;
 				}
 				lte->ntfs_loc->is_reparse_point = true;
-				lte->resource_entry.original_size = data_size - 8;
+				lte->size = data_size - 8;
 				ret = read_reparse_tag(ni, lte->ntfs_loc,
 						       &inode->i_reparse_tag);
 				if (ret)
 					goto out_free_lte;
 			} else {
 				lte->ntfs_loc->is_reparse_point = false;
-				lte->resource_entry.original_size = data_size;
+				lte->size = data_size;
 			}
 		}
 		if (name_length == 0) {
@@ -259,8 +275,8 @@ capture_ntfs_streams(struct wim_inode *inode,
 				if (lte) {
 					ERROR("Found two un-named data streams for \"%s\" "
 					      "(sizes = %"PRIu64", %"PRIu64")",
-					      path, wim_resource_size(inode->i_lte),
-					      wim_resource_size(lte));
+					      path, inode->i_lte->size,
+					      lte->size);
 					ret = WIMLIB_ERR_NTFS_3G;
 					goto out_free_lte;
 				}
@@ -658,7 +674,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 
 	if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)) {
 		struct SECURITY_CONTEXT sec_ctx;
-		char _sd[1];
+		char _sd[4096];
 		char *sd;
 
 		/* Get security descriptor */
@@ -666,7 +682,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
 		sec_ctx.vol = vol;
 
 		errno = 0;
-		ret = ntfs_get_ntfs_acl(&sec_ctx, ni, _sd, sizeof(_sd));
+		sd = _sd;
+		ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, sizeof(_sd));
 		if (ret > sizeof(_sd)) {
 			sd = alloca(ret);
 			ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret);