Skip to contentSkip to conversation

Decompressors: Validate match distance in decompress_unlzma.c

PATCH New Lasse Collin 1 participant 1 message Nov 23, 2010 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 4/4 Decompressors: Validate match distance in decompress_unlzma.c

From: Lasse Collin <[email protected]>

Validate the newly decoded distance (rep0) in process_bit1(). This is to detect corrupt LZMA data quickly. The old code can run for long time producing garbage until it hits the end of the input.

---

lib/decompress_unlzma.c renamed from lib/decompress_unlzma.c.orig +3 -0
@@ -528,6 +528,9 @@ static inline int INIT process_bit1(stru
 			cst->rep0 = pos_slot;
 		if (++(cst->rep0) == 0)
 			return 0;
+		if (cst->rep0 > wr->header->dict_size
+				|| cst->rep0 > get_pos(wr))
+			return -1;
 	}
 
 	len += LZMA_MATCH_MIN_LEN;