diff --git a/ChangeLog b/ChangeLog
index c798cdf8a..fbea1a7e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 10 22:36:35 CEST 2007 (tk)
+----------------------------------
+  * libclamav/ole2_extract.c: faster handling of corrupted files (bb#561)
+			      Reported by Victor Stinner, patch from Trog
+
 Tue Jul 10 22:23:24 CEST 2007 (tk)
 ----------------------------------
   * libclamav/others.c: bitset_realloc(): fix invalid state on realloc() failure (bb#560)
diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
index 8f1a2b5c3..acf4b0275 100644
--- a/libclamav/ole2_extract.c
+++ b/libclamav/ole2_extract.c
@@ -472,7 +472,7 @@ static void ole2_walk_property_tree(int fd, ole2_header_t *hdr, const char *dir,
 
 	current_block = hdr->prop_start;
 
-	if ((prop_index < 0) || (rec_level > 100) || (*file_count > 100000)) {
+	if ((prop_index < 0) || (prop_index > hdr->max_block_no) || (rec_level > 100) || (*file_count > 100000)) {
 		return;
 	}