d8086876a7
The LZMA functions are supposed to return the decompressed size, but what they actually return is just an unaltered field from the LZMA header that is *supposed* to contain the decompressed size. Apparently some encoders just overshoot that for no good reason. This patch changes the code such that the actual amount of decompressed bytes is returned. BRANCH=smaug BUG=None TEST=Printed output bytes when decompressing kernels with LZMA in depthcharge, noted that amounts now make sense. Change-Id: Icdd8f782aa87841f770eff4c14a08973530c7446 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 24b2fa8c9a342ca4288dad1430c8965395f00263 Original-Change-Id: Ib4cf8673846aedd34656e594ce7b8ea875b56099 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/282742 Original-Reviewed-by: Stefan Reinauer <reinauer@google.com> Original-Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/10777 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/*
|
|
* coreboot interface to memory-saving variant of LZMA decoder
|
|
*
|
|
* Copyright (C) 2006 Carl-Daniel Hailfinger
|
|
* Released under the GNU GPL v2 or later
|
|
*
|
|
* 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 <console/console.h>
|
|
#include <string.h>
|
|
#include <lib.h>
|
|
#include <timestamp.h>
|
|
|
|
#include "lzmadecode.h"
|
|
|
|
unsigned long ulzma(unsigned char * src, unsigned char * dst)
|
|
{
|
|
unsigned char properties[LZMA_PROPERTIES_SIZE];
|
|
UInt32 outSize;
|
|
SizeT inProcessed;
|
|
SizeT outProcessed;
|
|
int res;
|
|
CLzmaDecoderState state;
|
|
SizeT mallocneeds;
|
|
MAYBE_STATIC unsigned char scratchpad[15980];
|
|
unsigned char *cp;
|
|
|
|
/* Note: these timestamps aren't useful for memory-mapped media (x86) */
|
|
timestamp_add_now(TS_START_ULZMA);
|
|
memcpy(properties, src, LZMA_PROPERTIES_SIZE);
|
|
/* The outSize in LZMA stream is a 64bit integer stored in little-endian
|
|
* (ref: lzma.cc@LZMACompress: put_64). To prevent accessing by
|
|
* unaligned memory address and to load in correct endianness, read each
|
|
* byte and re-construct. */
|
|
cp = src + LZMA_PROPERTIES_SIZE;
|
|
outSize = cp[3] << 24 | cp[2] << 16 | cp[1] << 8 | cp[0];
|
|
if (LzmaDecodeProperties(&state.Properties, properties, LZMA_PROPERTIES_SIZE) != LZMA_RESULT_OK) {
|
|
printk(BIOS_WARNING, "lzma: Incorrect stream properties.\n");
|
|
return 0;
|
|
}
|
|
mallocneeds = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
|
|
if (mallocneeds > 15980) {
|
|
printk(BIOS_WARNING, "lzma: Decoder scratchpad too small!\n");
|
|
return 0;
|
|
}
|
|
state.Probs = (CProb *)scratchpad;
|
|
res = LzmaDecode(&state, src + LZMA_PROPERTIES_SIZE + 8, (SizeT)0xffffffff, &inProcessed,
|
|
dst, outSize, &outProcessed);
|
|
if (res != 0) {
|
|
printk(BIOS_WARNING, "lzma: Decoding error = %d\n", res);
|
|
return 0;
|
|
}
|
|
timestamp_add_now(TS_END_ULZMA);
|
|
return outProcessed;
|
|
}
|