tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools/Brotli: Fix compressed data loss issue 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2946

Currenly, when using the Brotli tool to compress data, the output
compressed binary file does not record complete compressed data
when size of input file is too large, which makes the data loss and
will trigger decompress-check issue.

The Brotli document mentioned:
The brotli tool use BrotliEncoderCompressStream method to compresses
input stream to output stream. Under some circumstances (e.g. lack of
output stream capacity) the BrotliEncoderOperation would require
several calls to BrotliEncoderCompressStream. The method must be
called again until both input stream is depleted and encoder has no
more output after the method is called.

This patch fixes this issue based on the Brotli document.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Chen, Christine 2021-05-14 14:04:44 +08:00 committed by mergify[bot]
parent e0cb5e1814
commit 9cd854e19d
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
BaseTools/Source/C/BrotliCompress/BrotliCompress.c
View File

@ -156,6 +156,7 @@ int CompressFile(char *InputFile, uint8_t *InputBuffer, char *OutputFile, uint8_
uint8_t *NextOut;
uint8_t *Input;
uint8_t *Output;
size_t TotalOut;
size_t OutSize;
uint32_t SizeHint;
BROTLI_BOOL IsOk;
@ -214,39 +215,53 @@ int CompressFile(char *InputFile, uint8_t *InputBuffer, char *OutputFile, uint8_
IsEof = !HasMoreInput(InputFileHandle);
}
if (!BrotliEncoderCompressStream(EncodeState,
IsEof ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS,
&AvailableIn, &NextIn, &AvailableOut, &NextOut, NULL)) {
printf("Failed to compress data [%s]\n", InputFile);
IsOk = BROTLI_FALSE;
goto Finish;
}
if (AvailableOut == 0) {
OutSize = (size_t)(NextOut - Output);
if (OutSize > 0) {
fwrite(Output, 1, OutSize, OutputFileHandle);
if (ferror(OutputFileHandle)) {
printf("Failed to write output [%s]\n", OutputFile);
if (!IsEof){
do{
if (!BrotliEncoderCompressStream(EncodeState,
BROTLI_OPERATION_FLUSH,
&AvailableIn, &NextIn, &AvailableOut, &NextOut, &TotalOut)) {
printf("Failed to compress data [%s]\n", InputFile);
IsOk = BROTLI_FALSE;
goto Finish;
}
OutSize = (size_t)(NextOut - Output);
if (OutSize > 0) {
fwrite(Output, 1, OutSize, OutputFileHandle);
if (ferror(OutputFileHandle)) {
printf("Failed to write output [%s]\n", OutputFile);
IsOk = BROTLI_FALSE;
goto Finish;
}
}
NextOut = Output;
AvailableOut = kFileBufferSize;
}
AvailableOut = kFileBufferSize;
NextOut = Output;
while (AvailableIn > 0 || BrotliEncoderHasMoreOutput(EncodeState));
}
if (BrotliEncoderIsFinished(EncodeState)) {
OutSize = (size_t)(NextOut - Output);
if (OutSize > 0) {
fwrite(Output, 1, OutSize, OutputFileHandle);
if (ferror(OutputFileHandle)) {
printf("Failed to write output [%s]\n", OutputFile);
else{
do{
if (!BrotliEncoderCompressStream(EncodeState,
BROTLI_OPERATION_FINISH,
&AvailableIn, &NextIn, &AvailableOut, &NextOut, &TotalOut)) {
printf("Failed to compress data [%s]\n", InputFile);
IsOk = BROTLI_FALSE;
goto Finish;
}
AvailableOut = 0;
OutSize = (size_t)(NextOut - Output);
if (OutSize > 0) {
fwrite(Output, 1, OutSize, OutputFileHandle);
if (ferror(OutputFileHandle)) {
printf("Failed to write output [%s]\n", OutputFile);
IsOk = BROTLI_FALSE;
goto Finish;
}
}
NextOut = Output;
AvailableOut = kFileBufferSize;
}
while (AvailableIn > 0 || BrotliEncoderHasMoreOutput(EncodeState));
}
if (IsEof) {
if (BrotliEncoderIsFinished(EncodeState)){
break;
}
}