From 1f723be7511d21a7d42bf93818fbd1cffb991c23 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Thu, 3 Apr 2008 12:35:13 +0000 Subject: [PATCH] fix possible infinite loop introduced in r3717 (bb#899) git-svn: trunk@3754 --- ChangeLog | 4 ++++ libclamav/mspack.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b705e84b..4ff873a63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 3 13:52:19 CEST 2008 (tk) +---------------------------------- + * libclamav/mspack.c: fix possible infinite loop introduced in r3717 (bb#899) + Wed Apr 2 22:54:23 CEST 2008 (tk) ---------------------------------- * libclamav/scanners.c: cl_scandesc: check if limits is not null (bb#907) diff --git a/libclamav/mspack.c b/libclamav/mspack.c index 24b5b2b3d..22dbc0d11 100644 --- a/libclamav/mspack.c +++ b/libclamav/mspack.c @@ -104,7 +104,7 @@ static const unsigned short mszip_bit_mask_tab[17] = { if (mszip_read_input(zip)) return zip->error; \ i_ptr = zip->i_ptr; \ i_end = zip->i_end; \ - if(i_ptr == i_end) break; \ + if(i_ptr == i_end) return CL_EFORMAT; \ } \ bit_buffer |= *i_ptr++ << bits_left; bits_left += 8; \ } \