diff --git a/payloads/libpayload/include/lz4.h b/payloads/libpayload/include/lz4.h index 249afb3a41..3879f47ab9 100644 --- a/payloads/libpayload/include/lz4.h +++ b/payloads/libpayload/include/lz4.h @@ -34,6 +34,9 @@ #include +#define LZ4F_MAGICNUMBER 0x184D2204 +#define LZ4_LEGACY_MAGICNUMBER 0x184C2102 + /* Decompresses an LZ4F image (multiple LZ4 blocks with frame header) from src * to dst, ensuring that it doesn't read more than srcn bytes and doesn't write * more than dstn. Buffer sizes must stay below 2GB. Can decompress files loaded diff --git a/payloads/libpayload/liblz4/lz4_wrapper.c b/payloads/libpayload/liblz4/lz4_wrapper.c index 160d5dcb74..f80ccc7178 100644 --- a/payloads/libpayload/liblz4/lz4_wrapper.c +++ b/payloads/libpayload/liblz4/lz4_wrapper.c @@ -73,9 +73,6 @@ typedef uint64_t U64; /* Unaltered (just removed unrelated code) from github.com/Cyan4973/lz4/dev. */ #include "lz4.c.inc" /* #include for inlining, do not link! */ -#define LZ4F_MAGICNUMBER 0x184D2204 -#define LEGACY_MAGICNUMBER 0x184C2102 - struct lz4_frame_header { uint32_t magic; union { @@ -198,7 +195,7 @@ size_t ulz4ln(const void *src, size_t srcn, void *dst, size_t dstn) void *out = dst; size_t out_size = 0; - if (le32toh(*((const uint32_t *)in)) != LEGACY_MAGICNUMBER) + if (le32toh(*((const uint32_t *)in)) != LZ4_LEGACY_MAGICNUMBER) return 0; in += sizeof(uint32_t);