c1a20f0cb8
This new version is used to implement the version which doesn't take the input and output buffer sizes. Old-Change-Id: I8935024aca0849bc939263d7fc3036c586e63c68 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65510 Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Gabe Black <gabeblack@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> (cherry picked from commit 465d167ad2f6a67d0b2c91fb6c68c8f9a09dd395) libpayload: Make lzma truncation non-fatal. If the size the lzma header claims it needs is bigger than the space we have, print a message and continue rather than erroring out. Apparently the encoder is lazy sometimes and just puts a large value there regardless of what the actual size is. This was the original intention for this code, but an outdated version of the patch ended up being submitted. Old-Change-Id: Ibcf7ac0fd4b65ce85377421a4ee67b82d92d29d3 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/66235 Reviewed-by: Stefan Reinauer <reinauer@google.com> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org> (cherry picked from commit 30c628eeada274fc8b94f8f69f9df4f33cbfc773) Squashed two related commits and updated the commit message to be more clear. Change-Id: I484b5c1e3809781033d146609a35a9e5e666c8ed Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6408 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
58 lines
1.6 KiB
C
58 lines
1.6 KiB
C
/*
|
|
* coreboot interface to memory-saving variant of LZMA decoder
|
|
*
|
|
* Copyright (C) 2006 Carl-Daniel Hailfinger
|
|
* Released under the BSD license
|
|
*
|
|
* Parts of this file are based on C/7zip/Compress/LZMA_C/LzmaTest.c from the LZMA
|
|
* SDK 4.42, which is written and distributed to public domain by Igor Pavlov.
|
|
*
|
|
*/
|
|
|
|
#include <lzma.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "lzmadecode.c"
|
|
|
|
unsigned long ulzman(const unsigned char *src, unsigned long srcn,
|
|
unsigned char *dst, unsigned long dstn)
|
|
{
|
|
unsigned char properties[LZMA_PROPERTIES_SIZE];
|
|
const int data_offset = LZMA_PROPERTIES_SIZE + 8;
|
|
UInt32 outSize;
|
|
SizeT inProcessed;
|
|
SizeT outProcessed;
|
|
int res;
|
|
CLzmaDecoderState state;
|
|
SizeT mallocneeds;
|
|
unsigned char scratchpad[15980];
|
|
|
|
memcpy(properties, src, LZMA_PROPERTIES_SIZE);
|
|
memcpy(&outSize, src + LZMA_PROPERTIES_SIZE, sizeof(outSize));
|
|
if (outSize > dstn)
|
|
outSize = dstn;
|
|
if (LzmaDecodeProperties(&state.Properties, properties,
|
|
LZMA_PROPERTIES_SIZE) != LZMA_RESULT_OK) {
|
|
printf("lzma: Incorrect stream properties.\n");
|
|
return 0;
|
|
}
|
|
mallocneeds = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
|
|
if (mallocneeds > 15980) {
|
|
printf("lzma: Decoder scratchpad too small!\n");
|
|
return 0;
|
|
}
|
|
state.Probs = (CProb *)scratchpad;
|
|
res = LzmaDecode(&state, src + data_offset, srcn - data_offset,
|
|
&inProcessed, dst, outSize, &outProcessed);
|
|
if (res != 0) {
|
|
printf("lzma: Decoding error = %d\n", res);
|
|
return 0;
|
|
}
|
|
return outSize;
|
|
}
|
|
|
|
unsigned long ulzma(const unsigned char *src, unsigned char *dst)
|
|
{
|
|
return ulzman(src, (unsigned long)(-1), dst, (unsigned long)(-1));
|
|
}
|