a9dc7c2f5
Denys Vlasenko
2014-06-30
Subject
lzop: add overflow check
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libarchive/liblzo.h+2 -0
| @@ -76,11 +76,13 @@ | |
| # define TEST_IP (ip < ip_end) | |
| # define NEED_IP(x) \ | |
| if ((unsigned)(ip_end - ip) < (unsigned)(x)) goto input_overrun | |
| + | # define TEST_IV(x) if ((x) > (unsigned)0 - (511)) goto input_overrun |
| # undef TEST_OP /* don't need both of the tests here */ | |
| # define TEST_OP 1 | |
| # define NEED_OP(x) \ | |
| if ((unsigned)(op_end - op) < (unsigned)(x)) goto output_overrun | |
| + | # define TEST_OV(x) if ((x) > (unsigned)0 - (511)) goto output_overrun |
| #define HAVE_ANY_OP 1 | |
archival/libarchive/lzo1x_d.c+3 -0
| @@ -92,6 +92,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, | |
| ip++; | |
| NEED_IP(1); | |
| } | |
| + | TEST_IV(t); |
| t += 15 + *ip++; | |
| } | |
| /* copy literals */ | |
| @@ -224,6 +225,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, | |
| ip++; | |
| NEED_IP(1); | |
| } | |
| + | TEST_IV(t); |
| t += 31 + *ip++; | |
| } | |
| #if defined(COPY_DICT) | |
| @@ -265,6 +267,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, | |
| ip++; | |
| NEED_IP(1); | |
| } | |
| + | TEST_IV(t); |
| t += 7 + *ip++; | |
| } | |
| #if defined(COPY_DICT) | |