b436e3c8aa
reference: https://github.com/google/brotli/pull/893 https://github.com/tianocore/edk2/pull/2347 https://github.com/tianocore/edk2/pull/2694 Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
90 lines
4.1 KiB
Diff
90 lines
4.1 KiB
Diff
From 0a3944c8c99b8d10cc4325f721b7c273d2b41f7b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Adri=C3=A1n=20Herrera=20Arcila?= <adr.her.arc.95@gmail.com>
|
|
Date: Wed, 23 Jun 2021 08:53:59 +0100
|
|
Subject: [PATCH] Fix VLA parameter warning (#893)
|
|
|
|
Make VLA buffer types consistent in declarations and definitions.
|
|
Resolves build crash when using -Werror due to "vla-parameter" warning.
|
|
|
|
Signed-off-by: Adrian Herrera <adr.her.arc.95@gmail.com>
|
|
|
|
reference: https://github.com/google/brotli/pull/893
|
|
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
|
|
---
|
|
BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c | 6 ++++--
|
|
BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c | 5 +++--
|
|
.../Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c | 6 ++++--
|
|
.../Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c | 5 +++--
|
|
4 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c
|
|
index ae5a3d3..7eee968 100644
|
|
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c
|
|
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/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/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c b/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c
|
|
index 8d90937..0c49c64 100644
|
|
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c
|
|
+++ b/MdeModulePkg/Library/BrotliCustomDecompressLib/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;
|
|
|
|
diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
|
|
index ae5a3d3..7eee968 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/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
|
|
index 8d90937..0c49c64 100644
|
|
--- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
|
|
+++ b/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.41.0
|
|
|