X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fresource.c;h=300aec8f1cbec29e0b919bba8243984e7e518271;hp=d2a4c3098327797cd1022b7989e144fb7d474bf8;hb=9e5404f2c773173ebaae519d7ebacb2d802b263f;hpb=4a6f090f05ef6959a547b3d40940897d879ce050

diff --git a/src/resource.c b/src/resource.c
index d2a4c309..300aec8f 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -37,7 +37,7 @@
 #include "wimlib/wim.h"
 
 #ifdef __WIN32__
-/* for read_win32_file_prefix(), read_win32_encrypted_file_prefix() */
+/* for read_winnt_file_prefix(), read_win32_encrypted_file_prefix() */
 #  include "wimlib/win32.h"
 #endif
 
@@ -138,6 +138,7 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec,
 	int errno_save;
 
 	u64 *chunk_offsets = NULL;
+	u8 *_ubuf = NULL;
 	u8 *ubuf = NULL;
 	void *cbuf = NULL;
 	bool chunk_offsets_malloced = false;
@@ -171,7 +172,7 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec,
 	/* Determine if we're reading a pipable resource from a pipe or not.  */
 	const bool is_pipe_read = (rspec->is_pipable && !filedes_is_seekable(in_fd));
 
-	/* Determine if the chunk table is in an altenate format.  */
+	/* Determine if the chunk table is in an alternate format.  */
 	const bool alt_chunk_table = (rspec->flags & WIM_RESHDR_FLAG_PACKED_STREAMS)
 					&& !is_pipe_read;
 
@@ -368,13 +369,14 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec,
 
 	/* Allocate buffer for holding the uncompressed data of each chunk.  */
 	if (chunk_size <= STACK_MAX) {
-		ubuf = alloca(chunk_size);
+		_ubuf = alloca(chunk_size + 15);
 	} else {
-		ubuf = MALLOC(chunk_size);
-		if (ubuf == NULL)
+		_ubuf = MALLOC(chunk_size + 15);
+		if (_ubuf == NULL)
 			goto oom;
 		ubuf_malloced = true;
 	}
+	ubuf = (u8 *)(((uintptr_t)_ubuf + 15) & ~15);
 
 	/* Allocate a temporary buffer for reading compressed chunks, each of
 	 * which can be at most @chunk_size - 1 bytes.  This excludes compressed
@@ -548,7 +550,7 @@ out_free_memory:
 	if (chunk_offsets_malloced)
 		FREE(chunk_offsets);
 	if (ubuf_malloced)
-		FREE(ubuf);
+		FREE(_ubuf);
 	if (cbuf_malloced)
 		FREE(cbuf);
 	errno = errno_save;