summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2016-07-11 15:42:20 +0200
committerRichard Weinberger <richard@nod.at>2016-08-25 15:33:41 +0200
commita6dcd8f3215b435ba21ce26eb230b1484417d1e3 (patch)
tree0b82b64ffeaa8c86f816ca686342bdfb990c008c
parentfd6fc61227867179c87b6ee5d2199b3976ffef12 (diff)
mtd-utils: mkfs.jffs2: initialize lzo decompression buffer size
This fix was initialially part of a patch submitted by Carsten Schlote in January 2009. It didn't get merged back then because of coding style issues and a proposed buffer size change guessed by shotgun debugging. I was unable to reproduce the claimed segfaults in the compression function that lead to the proposed buffer size change. Valgrind did not issue any errors or warnings about the code in question either, so I didn't include the proposed buffer size change. The original patch also added a call to lzo_init(), which (according to LZO documentation & source code) does not actually perform any initialization, but only checks at runtime that the data type sizes and endianness of the library code match those in the caller code and should be unnecessary. Other fixes from the original patch have already been added over the years. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--jffsX-utils/compr_lzo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/jffsX-utils/compr_lzo.c b/jffsX-utils/compr_lzo.c
index d2e2afc..56aa1b4 100644
--- a/jffsX-utils/compr_lzo.c
+++ b/jffsX-utils/compr_lzo.c
@@ -73,6 +73,7 @@ static int jffs2_lzo_decompress(unsigned char *data_in, unsigned char *cpage_out
int ret;
lzo_uint dl;
+ dl = destlen;
ret = lzo1x_decompress_safe(data_in,srclen,cpage_out,&dl,NULL);
if (ret != LZO_E_OK || dl != destlen)