X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flzms-common.c;h=95682d53a56490fd382d57b7d779b001e78782b7;hp=b5d4fcd5a15d1593bb35f511a9d2763673924615;hb=1c1c12926f4de39cb35d8d4c5a5280ab0d6ba931;hpb=0ac1c0afd3f1b4341409e66cb31c94053d1b8988 diff --git a/src/lzms-common.c b/src/lzms-common.c index b5d4fcd5..95682d53 100644 --- a/src/lzms-common.c +++ b/src/lzms-common.c @@ -28,6 +28,7 @@ #include "wimlib/endianness.h" #include "wimlib/lzms.h" +#include "wimlib/unaligned.h" #include "wimlib/util.h" #include @@ -157,20 +158,20 @@ lzms_maybe_do_x86_translation(u8 data[restrict], s32 i, s32 num_op_bytes, if (i - *closest_target_usage_p <= max_trans_offset) { LZMS_DEBUG("Undid x86 translation at position %d " "(opcode 0x%02x)", i, data[i]); - le32 *p32 = (le32*)&data[i + num_op_bytes]; - u32 n = le32_to_cpu(*p32); - *p32 = cpu_to_le32(n - i); + void *p32 = &data[i + num_op_bytes]; + u32 n = le32_to_cpu(load_le32_unaligned(p32)); + store_le32_unaligned(cpu_to_le32(n - i), p32); } - pos = i + le16_to_cpu(*(const le16*)&data[i + num_op_bytes]); + pos = i + le16_to_cpu(load_le16_unaligned(&data[i + num_op_bytes])); } else { - pos = i + le16_to_cpu(*(const le16*)&data[i + num_op_bytes]); + pos = i + le16_to_cpu(load_le16_unaligned(&data[i + num_op_bytes])); if (i - *closest_target_usage_p <= max_trans_offset) { LZMS_DEBUG("Did x86 translation at position %d " "(opcode 0x%02x)", i, data[i]); - le32 *p32 = (le32*)&data[i + num_op_bytes]; - u32 n = le32_to_cpu(*p32); - *p32 = cpu_to_le32(n + i); + void *p32 = &data[i + num_op_bytes]; + u32 n = le32_to_cpu(load_le32_unaligned(p32)); + store_le32_unaligned(cpu_to_le32(n + i), p32); } }