ImageExtractor: Improve BMP detection to prevent situations with all 00 bytes

This commit is contained in:
RichardG867
2024-11-23 11:07:11 -03:00
parent bab613ea92
commit cf7552eff5

View File

@@ -891,7 +891,7 @@ class ImageExtractor(Extractor):
# Header pattern for common format images.
self._pil_pattern = re.compile(
b'''\\x0A[\\x00-\\x05][\\x00-\\x01][\\x01\\x02\\x04\\x08]|''' # PCX
b'''BM[\\x00-\\xFF]{3}\\x00[\\x00-\\xFF]{7}\\x00|''' # BMP (limited to 16 MB size and start offset)
b'''BM(?!\\x00{3})[\\x00-\\xFF]{3}\\x00[\\x00-\\xFF]{4}(?!\\x00{3})[\\x00-\\xFF]{3}\\x00|''' # BMP (limited to 16 MB size and start offset)
b'''\\xFF\\xD8\\xFF|''' # JPEG
b'''GIF8[79]a|''' # GIF
b'''\\x89PNG''' # PNG