lzx-decompress.c: Add SSE2 version of undo_call_insn_preprocessing()

[wimlib] / src / resource.c

diff --git a/src/resource.c b/src/resource.c
index f7684b10baee9bab6fffaa109f0977e79a19d1ed..300aec8f1cbec29e0b919bba8243984e7e518271 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -138,6 +138,7 @@ read_compressed_wim_resource(const struct wim_resource_spec * const rspec,
        int errno_save;
 
        u64 *chunk_offsets = NULL;
        int errno_save;
 
        u64 *chunk_offsets = NULL;

+       u8 *_ubuf = NULL;

        u8 *ubuf = NULL;
        void *cbuf = NULL;
        bool chunk_offsets_malloced = false;
        u8 *ubuf = NULL;
        void *cbuf = NULL;
        bool chunk_offsets_malloced = false;


@@ -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) {
 
        /* 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 {
        } else {

-               ubuf = MALLOC(chunk_size);
-               if (ubuf == NULL)
+               _ubuf = MALLOC(chunk_size + 15);
+               if (_ubuf == NULL)

                        goto oom;
                ubuf_malloced = true;
        }
                        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
 
        /* 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)
        if (chunk_offsets_malloced)
                FREE(chunk_offsets);
        if (ubuf_malloced)

-               FREE(ubuf);
+               FREE(_ubuf);

        if (cbuf_malloced)
                FREE(cbuf);
        errno = errno_save;
        if (cbuf_malloced)
                FREE(cbuf);
        errno = errno_save;