leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/lzo: bugfix when input data is not compressed

Browse Source 
When the input data is not compressed at all,
lzo1x_decompress_safe will fail, so call memcpy()
instead.

Signed-off-by: Joris Lijssens <joris.lijssens@gmail.com>
This commit is contained in:
Joris Lijssens 2016-06-17 10:46:58 +02:00 committed by Tom Rini
parent 96044745cb
commit a2cfc8d593
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/lzo/lzo1x_decompress.c
View File

@ -98,18 +98,25 @@ int lzop_decompress(const unsigned char *src, size_t src_len,
if (dlen > remaining)
return LZO_E_OUTPUT_OVERRUN;
/* decompress */
tmp = dlen;
r = lzo1x_decompress_safe((u8 *) src, slen, dst, &tmp);
/* When the input data is not compressed at all,
* lzo1x_decompress_safe will fail, so call memcpy()
* instead */
if (dlen == slen) {
memcpy(dst, src, slen);
} else {
/* decompress */
tmp = dlen;
r = lzo1x_decompress_safe((u8 *)src, slen, dst, &tmp);
if (r != LZO_E_OK) {
*dst_len = dst - start;
return r;
if (r != LZO_E_OK) {
*dst_len = dst - start;
return r;
}
if (dlen != tmp)
return LZO_E_ERROR;
}
if (dlen != tmp)
return LZO_E_ERROR;
src += slen;
dst += dlen;
remaining -= dlen;