From e1e82f74f1f992acb6d98577e167d2e7cfe45f70 Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Tue, 13 Dec 2022 17:45:05 -0800 Subject: [PATCH 1/2] Reserve two fields in ZSTD_frameHeader --- lib/zstd.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/zstd.h b/lib/zstd.h index 1867efc93..1dff31b4e 100644 --- a/lib/zstd.h +++ b/lib/zstd.h @@ -2573,6 +2573,8 @@ typedef struct { unsigned headerSize; unsigned dictID; unsigned checksumFlag; + unsigned _reserved1; + unsigned _reserved2; } ZSTD_frameHeader; /*! ZSTD_getFrameHeader() : From c43da3d6059a277ab5d76236bdb66ba2b36264a1 Mon Sep 17 00:00:00 2001 From: Elliot Gorokhovsky Date: Tue, 13 Dec 2022 18:01:32 -0800 Subject: [PATCH 2/2] Fix C90 compat --- lib/decompress/zstd_decompress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c index 9fe326e73..df831b774 100644 --- a/lib/decompress/zstd_decompress.c +++ b/lib/decompress/zstd_decompress.c @@ -1549,7 +1549,7 @@ unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize) * ZSTD_getFrameHeader(), which will provide a more precise error code. */ unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize) { - ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0 }; + ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0, 0, 0 }; size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize); if (ZSTD_isError(hError)) return 0; return zfp.dictID;