mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: add sanity checks to decode_rle

Browse Source 
Also use -EINVAL instead of -1.

SVN-Revision: 31353
This commit is contained in:
Gabor Juhos 2012-04-19 21:31:40 +00:00
parent 8f921175ba
commit 5c9ca38e47
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
View File

@ -299,24 +299,29 @@ static int decode_rle(char *output, int len, char *in)
{ {
char *ptr = output; char *ptr = output;
char *end = output + len; char *end = output + len;
if (!output || !in)
return -EINVAL;
while (*in) { while (*in) {
if (*in < 0) { if (*in < 0) {
int i = -*in++; int i = -*in++;
while (i-- > 0) { while (i-- > 0) {
if (ptr >= end) if (ptr >= end)
return -1; return -EINVAL;
*ptr++ = *in++; *ptr++ = *in++;
} }
} else if (*in > 0) { } else if (*in > 0) {
int i = *in++; int i = *in++;
while (i-- > 0) { while (i-- > 0) {
if (ptr >= end) if (ptr >= end)
return -1; return -EINVAL;
*ptr++ = *in; *ptr++ = *in;
} }
in++; in++;
} }
} }
return ptr - output; return ptr - output;
} }