00e5da6f25
Use memcpy to access a uint32_t that's inherently unaligned due to the layout of the LZMA header format. Built and booted on Daisy and saw a data abort go away. Built and booted into developer mode on Link and verified that bitmaps were decompressed/displayed correctly. Change-Id: Id3ae746c04d23bcb0345cb71797bfa219479cc8f Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: http://review.coreboot.org/2670 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
48 lines
1.3 KiB
C
48 lines
1.3 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 ulzma(const unsigned char * src, unsigned char * dst)
|
|
{
|
|
unsigned char properties[LZMA_PROPERTIES_SIZE];
|
|
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 (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 + LZMA_PROPERTIES_SIZE + 8, (SizeT)0xffffffff, &inProcessed,
|
|
dst, outSize, &outProcessed);
|
|
if (res != 0) {
|
|
printf("lzma: Decoding error = %d\n", res);
|
|
return 0;
|
|
}
|
|
return outSize;
|
|
}
|