qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: gzip: add a function to parse the header 

Change-Id: I9829ad25a955eb4764ae2e66f1c32751703d9ae6
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 376ddf9d4a21d0af4c70e97c52e5f0854fb2d696)
This commit is contained in:
Jean-Jacques Hiblot 2017-09-15 12:57:29 +02:00 committed by Kever Yang
parent df70772d8a
commit 194712615e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common.h
View File

@ -629,6 +629,7 @@ ulong usec2ticks (unsigned long usec);
ulong ticks2usec (unsigned long ticks); ulong ticks2usec (unsigned long ticks);
/* lib/gunzip.c */ /* lib/gunzip.c */
int gzip_parse_header(const unsigned char *src, unsigned long len);
int gunzip(void *, int, unsigned char *, unsigned long *); int gunzip(void *, int, unsigned char *, unsigned long *);
int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
int stoponerr, int offset); int stoponerr, int offset);

15
lib/gunzip.c
View File

@ -42,7 +42,7 @@ void gzfree(void *x, void *addr, unsigned nb)
free (addr); free (addr);
} }
int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) int gzip_parse_header(const unsigned char *src, unsigned long len)
{ {
int i, flags; int i, flags;
@ -63,12 +63,21 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
; ;
if ((flags & HEAD_CRC) != 0) if ((flags & HEAD_CRC) != 0)
i += 2; i += 2;
if (i >= *lenp) { if (i >= len) {
puts ("Error: gunzip out of data in header\n"); puts ("Error: gunzip out of data in header\n");
return (-1); return (-1);
} }
return i;
}
return zunzip(dst, dstlen, src, lenp, 1, i); int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
{
int offset = gzip_parse_header(src, *lenp);
if (offset < 0)
return offset;
return zunzip(dst, dstlen, src, lenp, 1, offset);
} }
#ifdef CONFIG_CMD_UNZIP #ifdef CONFIG_CMD_UNZIP