X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=586181020d00a3153f059a1a145e8282700999eb;hp=c05eb192b4105a86c2c90f7652320fe232f056a4;hb=389f993fdf085a9bf120f8a17464e321d6e42898;hpb=5caa3dfded8e0f590112b59feeb3b55e4fa28420

diff --git a/src/win32_capture.c b/src/win32_capture.c
index c05eb192..58618102 100644
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -154,9 +154,10 @@ win32_encrypted_export_cb(unsigned char *_data, void *_ctx, unsigned long len)
 		}
 	} else {
 		size_t len_to_copy = min(len, ctx->bytes_remaining);
-		memcpy(ctx->read_prefix_ctx_or_buf, data, len_to_copy);
+		ctx->read_prefix_ctx_or_buf = mempcpy(ctx->read_prefix_ctx_or_buf,
+						      data,
+						      len_to_copy);
 		ctx->bytes_remaining -= len_to_copy;
-		ctx->read_prefix_ctx_or_buf += len_to_copy;
 	}
 	return ERROR_SUCCESS;
 }
@@ -506,12 +507,10 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 			const wchar_t *path)
 {
 	struct reparse_data rpdata;
-	DWORD rpbuflen;
 	int ret;
 	enum rp_status rp_status;
 
-	rpbuflen = *rpbuflen_p;
-	ret = parse_reparse_data(rpbuf, rpbuflen, &rpdata);
+	ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
 	if (ret)
 		return -ret;
 
@@ -535,7 +534,7 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 			rpdata.print_name += 4;
 			rpdata.print_name_nbytes -= 8;
 		}
-		ret = make_reparse_buffer(&rpdata, rpbuf);
+		ret = make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
 		if (ret == 0)
 			ret = rp_status;
 		else