From 27dd7265403d8e8fed99a854b9c3e1db7d79525f Mon Sep 17 00:00:00 2001 From: Jeremy Maitin-Shepard Date: Tue, 14 Sep 2021 12:27:45 -0700 Subject: [PATCH] Fix -Werror=vla-parameter errors with GCC 11.2.0 --- c/common/shared_dictionary.c | 2 +- c/dec/decode.c | 5 +++-- c/enc/encode.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/c/common/shared_dictionary.c b/c/common/shared_dictionary.c index 20ba73a80..dc291100d 100644 --- a/c/common/shared_dictionary.c +++ b/c/common/shared_dictionary.c @@ -460,7 +460,7 @@ void BrotliSharedDictionaryDestroyInstance( BROTLI_BOOL BrotliSharedDictionaryAttach( BrotliSharedDictionary* dict, BrotliSharedDictionaryType type, - size_t data_size, const uint8_t* data) { + size_t data_size, const uint8_t data[BROTLI_ARRAY_PARAM(data_size)]) { if (!dict) { return BROTLI_FALSE; } diff --git a/c/dec/decode.c b/c/dec/decode.c index 7370daa7e..e7e14fbe6 100644 --- a/c/dec/decode.c +++ b/c/dec/decode.c @@ -1494,8 +1494,9 @@ static int CopyFromCompoundDictionary(BrotliDecoderState* s, int pos) { return pos - orig_pos; } -BROTLI_BOOL BrotliDecoderAttachDictionary(BrotliDecoderState* state, - BrotliSharedDictionaryType type, size_t data_size, const uint8_t* data) { +BROTLI_BOOL BrotliDecoderAttachDictionary( + BrotliDecoderState* state, BrotliSharedDictionaryType type, + size_t data_size, const uint8_t data[BROTLI_ARRAY_PARAM(data_size)]) { uint32_t i; uint32_t num_prefix_before = state->dictionary->num_prefix; if (state->state != BROTLI_STATE_UNINITED) return BROTLI_FALSE; diff --git a/c/enc/encode.c b/c/enc/encode.c index 3076e664f..dee6ee834 100644 --- a/c/enc/encode.c +++ b/c/enc/encode.c @@ -1974,8 +1974,8 @@ uint32_t BrotliEncoderVersion(void) { } BrotliEncoderPreparedDictionary* BrotliEncoderPrepareDictionary( - BrotliSharedDictionaryType type, size_t size, const uint8_t* data, - int quality, + BrotliSharedDictionaryType type, size_t size, + const uint8_t data[BROTLI_ARRAY_PARAM(size)], int quality, brotli_alloc_func alloc_func, brotli_free_func free_func, void* opaque) { ManagedDictionary* managed_dictionary = NULL; if (type != BROTLI_SHARED_DICTIONARY_RAW &&