ca7247c1a8
- Add fix-brotli-vla-error.patch in order to fix bsc#1181922. OBS-URL: https://build.opensuse.org/request/show/893748 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=647
78 lines
3.8 KiB
Diff
78 lines
3.8 KiB
Diff
Author: Adrian Herrera <adr.her.arc.95@gmail.com>
|
|
Date: Mon Mar 22 21:06:47 2021 +0000
|
|
Subject: Fix VLA parameter warning
|
|
|
|
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>
|
|
|
|
Taken from: https://github.com/google/brotli/pull/893
|
|
|
|
diff --git a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
|
|
index 114c5057d..bb6f1ab6c 100644
|
|
--- a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
|
|
+++ b/roms/edk2/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/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
|
|
index 68548ef55..ab0a49060 100644
|
|
--- a/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
|
|
+++ b/roms/edk2/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;
|
|
diff --git a/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c b/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c
|
|
index 114c5057d..bb6f1ab6c 100644
|
|
--- a/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/dec/decode.c
|
|
+++ b/roms/edk2/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/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c b/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c
|
|
index 68548ef55..ab0a49060 100644
|
|
--- a/roms/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/c/enc/encode.c
|
|
+++ b/roms/edk2/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;
|