From 103a85d14b19fdc77fa413f4e03fc212973c0356 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Tue, 25 Jan 2022 13:53:35 -0300 Subject: [PATCH] Fix ACPI table and option ROM regexes skipping bytes --- biostools/analyzers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biostools/analyzers.py b/biostools/analyzers.py index ce6c3d0..154ac05 100644 --- a/biostools/analyzers.py +++ b/biostools/analyzers.py @@ -994,10 +994,10 @@ class BonusAnalyzer(Analyzer): super().__init__('', *args, **kwargs) self._pci_ids = {} - self._acpi_table_pattern = re.compile(b'''(?:APIC|DSDT|FACP|PSDT|RSDT|SBST|SSDT)(.{4}).{24}[\\x00\\x20-\\x7E]{4}''') + self._acpi_table_pattern = re.compile(b'''(?:APIC|DSDT|FACP|PSDT|RSDT|SBST|SSDT)([\\x00-\\xFF]{4})[\\x00-\\xFF]{24}[\\x00\\x20-\\x7E]{4}''') self._adaptec_pattern = re.compile(b'''Adaptec (?:BIOS:|([\\x20-\\x7E]+) BIOS )''') self._ncr_pattern = re.compile(b''' SDMS \(TM\) V([0-9])''') - self._pci_rom_pattern = re.compile(b'''\\x55\\xAA[^\\x00].{21}(.{2})''') + self._pci_rom_pattern = re.compile(b'''\\x55\\xAA[^\\x00][\\x00-\\xFF]{21}([\\x00-\\xFF]{2})''') self._phoenixnet_patterns = ( re.compile(b'''CPLRESELLERID'''), re.compile(b'''BINCPUTBL'''),