|
 |
26dcee |
diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c
|
|
|
26dcee |
index 34ce0f0..ecfdf66 100644
|
|
|
26dcee |
--- a/minilzo/minilzo.c
|
|
|
26dcee |
+++ b/minilzo/minilzo.c
|
|
|
26dcee |
@@ -3547,6 +3547,8 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
#undef TEST_LBO
|
|
|
26dcee |
#undef NEED_IP
|
|
|
26dcee |
#undef NEED_OP
|
|
|
26dcee |
+#undef TEST_IV
|
|
|
26dcee |
+#undef TEST_OV
|
|
|
26dcee |
#undef HAVE_TEST_IP
|
|
|
26dcee |
#undef HAVE_TEST_OP
|
|
|
26dcee |
#undef HAVE_NEED_IP
|
|
|
26dcee |
@@ -3561,6 +3563,7 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
# if (LZO_TEST_OVERRUN_INPUT >= 2)
|
|
|
26dcee |
# define NEED_IP(x) \
|
|
|
26dcee |
if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun
|
|
|
26dcee |
+# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -3572,6 +3575,7 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
# undef TEST_OP
|
|
|
26dcee |
# define NEED_OP(x) \
|
|
|
26dcee |
if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun
|
|
|
26dcee |
+# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -3602,11 +3606,13 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
# define HAVE_NEED_IP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_IP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_IV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
#if defined(NEED_OP)
|
|
|
26dcee |
# define HAVE_NEED_OP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_OP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_OV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
|
|
|
26dcee |
@@ -3687,6 +3693,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_IV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 15 + *ip++;
|
|
|
26dcee |
@@ -3835,6 +3842,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 31 + *ip++;
|
|
|
26dcee |
@@ -3879,6 +3887,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 7 + *ip++;
|
|
|
26dcee |
@@ -4073,6 +4082,8 @@ lookbehind_overrun:
|
|
|
26dcee |
#undef TEST_LBO
|
|
|
26dcee |
#undef NEED_IP
|
|
|
26dcee |
#undef NEED_OP
|
|
|
26dcee |
+#undef TEST_IV
|
|
|
26dcee |
+#undef TEST_OV
|
|
|
26dcee |
#undef HAVE_TEST_IP
|
|
|
26dcee |
#undef HAVE_TEST_OP
|
|
|
26dcee |
#undef HAVE_NEED_IP
|
|
|
26dcee |
@@ -4087,6 +4098,7 @@ lookbehind_overrun:
|
|
|
26dcee |
# if (LZO_TEST_OVERRUN_INPUT >= 2)
|
|
|
26dcee |
# define NEED_IP(x) \
|
|
|
26dcee |
if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun
|
|
|
26dcee |
+# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -4098,6 +4110,7 @@ lookbehind_overrun:
|
|
|
26dcee |
# undef TEST_OP
|
|
|
26dcee |
# define NEED_OP(x) \
|
|
|
26dcee |
if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun
|
|
|
26dcee |
+# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -4128,11 +4141,13 @@ lookbehind_overrun:
|
|
|
26dcee |
# define HAVE_NEED_IP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_IP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_IV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
#if defined(NEED_OP)
|
|
|
26dcee |
# define HAVE_NEED_OP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_OP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_OV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
|
|
|
26dcee |
@@ -4213,6 +4228,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_IV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 15 + *ip++;
|
|
|
26dcee |
@@ -4361,6 +4377,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 31 + *ip++;
|
|
|
26dcee |
@@ -4405,6 +4422,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 7 + *ip++;
|
|
|
26dcee |
diff --git a/src/lzo1_d.ch b/src/lzo1_d.ch
|
|
|
26dcee |
index 40a5bfd..c442d9c 100644
|
|
|
26dcee |
--- a/src/lzo1_d.ch
|
|
|
26dcee |
+++ b/src/lzo1_d.ch
|
|
|
26dcee |
@@ -76,6 +76,8 @@
|
|
|
26dcee |
#undef TEST_LBO
|
|
|
26dcee |
#undef NEED_IP
|
|
|
26dcee |
#undef NEED_OP
|
|
|
26dcee |
+#undef TEST_IV
|
|
|
26dcee |
+#undef TEST_OV
|
|
|
26dcee |
#undef HAVE_TEST_IP
|
|
|
26dcee |
#undef HAVE_TEST_OP
|
|
|
26dcee |
#undef HAVE_NEED_IP
|
|
|
26dcee |
@@ -91,6 +93,7 @@
|
|
|
26dcee |
# if (LZO_TEST_OVERRUN_INPUT >= 2)
|
|
|
26dcee |
# define NEED_IP(x) \
|
|
|
26dcee |
if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun
|
|
|
26dcee |
+# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -102,6 +105,7 @@
|
|
|
26dcee |
# undef TEST_OP /* don't need both of the tests here */
|
|
|
26dcee |
# define NEED_OP(x) \
|
|
|
26dcee |
if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun
|
|
|
26dcee |
+# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun
|
|
|
26dcee |
# endif
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
@@ -135,11 +139,13 @@
|
|
|
26dcee |
# define HAVE_NEED_IP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_IP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_IV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
#if defined(NEED_OP)
|
|
|
26dcee |
# define HAVE_NEED_OP 1
|
|
|
26dcee |
#else
|
|
|
26dcee |
# define NEED_OP(x) ((void) 0)
|
|
|
26dcee |
+# define TEST_OV(x) ((void) 0)
|
|
|
26dcee |
#endif
|
|
|
26dcee |
|
|
|
26dcee |
|
|
|
26dcee |
diff --git a/src/lzo1b_d.ch b/src/lzo1b_d.ch
|
|
|
26dcee |
index fe5f361..36b4b6b 100644
|
|
|
26dcee |
--- a/src/lzo1b_d.ch
|
|
|
26dcee |
+++ b/src/lzo1b_d.ch
|
|
|
26dcee |
@@ -187,6 +187,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++;
|
|
|
26dcee |
diff --git a/src/lzo1f_d.ch b/src/lzo1f_d.ch
|
|
|
26dcee |
index 9e942f5..0c2199e 100644
|
|
|
26dcee |
--- a/src/lzo1f_d.ch
|
|
|
26dcee |
+++ b/src/lzo1f_d.ch
|
|
|
26dcee |
@@ -84,6 +84,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_IV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 31 + *ip++;
|
|
|
26dcee |
@@ -138,6 +139,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 31 + *ip++;
|
|
|
26dcee |
diff --git a/src/lzo1x_d.ch b/src/lzo1x_d.ch
|
|
|
26dcee |
index 49cf326..c804cc7 100644
|
|
|
26dcee |
--- a/src/lzo1x_d.ch
|
|
|
26dcee |
+++ b/src/lzo1x_d.ch
|
|
|
26dcee |
@@ -120,6 +120,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_IV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 15 + *ip++;
|
|
|
26dcee |
@@ -273,6 +274,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 31 + *ip++;
|
|
|
26dcee |
@@ -317,6 +319,7 @@ match:
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += 7 + *ip++;
|
|
|
26dcee |
diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch
|
|
|
26dcee |
index 48e51ca..954f07e 100644
|
|
|
26dcee |
--- a/src/lzo2a_d.ch
|
|
|
26dcee |
+++ b/src/lzo2a_d.ch
|
|
|
26dcee |
@@ -131,6 +131,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len,
|
|
|
26dcee |
{
|
|
|
26dcee |
t += 255;
|
|
|
26dcee |
ip++;
|
|
|
26dcee |
+ TEST_OV(t);
|
|
|
26dcee |
NEED_IP(1);
|
|
|
26dcee |
}
|
|
|
26dcee |
t += *ip++;
|