From 498627ebda6271b59920f43a0b9b6187edeb7b09 Mon Sep 17 00:00:00 2001 From: Adrian Herrera Date: Mon, 22 Mar 2021 21:06:47 +0000 Subject: [PATCH] Fix VLA parameter warning Make VLA buffer types consistent in declarations and definitions. Resolves build crash when using -Werror due to "vla-parameter" warning. Upstream-Status: Submitted [https://github.com/google/brotli/pull/893] Signed-off-by: Adrian Herrera --- c/dec/decode.c | 6 ++++-- c/enc/encode.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c index 114c505..bb6f1ab 100644 --- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c +++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c @@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands( } BrotliDecoderResult BrotliDecoderDecompress( - size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, - uint8_t* decoded_buffer) { + size_t encoded_size, + const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], + size_t* decoded_size, + uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { BrotliDecoderState s; BrotliDecoderResult result; size_t total_out = 0; diff --git a/c/enc/encode.c b/c/enc/encode.c index 68548ef..ab0a490 100644 --- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c +++ c/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c @@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( BROTLI_BOOL BrotliEncoderCompress( int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, - const uint8_t* input_buffer, size_t* encoded_size, - uint8_t* encoded_buffer) { + const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], + size_t* encoded_size, + uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { BrotliEncoderState* s; size_t out_size = *encoded_size; const uint8_t* input_start = input_buffer; -- 2.31.1