mirror/86Box-bios-tools
1
0
Fork 0
mirror of https://github.com/86Box/bios-tools.git synced 2026-02-22 01:25:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix ASTExtractor incorrectly triggering FATExtractor

Browse Source
This commit is contained in:
RichardG867
2022-05-17 12:22:14 -03:00
parent 56389010fb
commit a1c6ccbebe
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
biostools/analyzers.py
View File

@@ -1104,7 +1104,7 @@ class BonusAnalyzer(Analyzer):
self._pci_ids = {}
self._acpi_table_pattern = re.compile(b'''(?: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._adaptec_pattern = re.compile(b'''Adaptec (?:BIOS:|[\\x20-\\x7E]+ BIOS )''')
self._ncr_pattern = re.compile(b''' SDMS \\(TM\\) V([0-9])''')
self._orom_pattern = re.compile(b'''\\x55\\xAA[\\x01-\\xFF][\\x00-\\xFF]{21}([\\x00-\\xFF]{4})([\\x00-\\xFF]{2}IBM)?''')
self._phoenixnet_patterns = (

17
biostools/extractors.py
View File

@@ -260,7 +260,9 @@ class ArchiveExtractor(Extractor):
class ASTExtractor(Extractor):
"""Extract AST BIOS flash files."""
"""Extract AST BIOS flash floppy images. These appear to contain a specially
crafted FAT filesystem, likely with static sector offsets for the payload,
so we work on the entire image before FATExtractor has a chance to claim it."""
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -282,12 +284,13 @@ class ASTExtractor(Extractor):
if not util.try_makedirs(dest_dir):
return True
# Open AST file.
# Open AST image.
with open(file_path, 'rb') as in_f:
# Read the initial 72 sectors as header data.
header = in_f.read(0x9000)
# Skip the initial 72 sectors.
in_f.seek(0x9000)
# Copy payload.
header = b''
dest_file_path = os.path.join(dest_dir, 'ast.bin')
try:
with open(dest_file_path, 'wb') as out_f:
@@ -297,10 +300,10 @@ class ASTExtractor(Extractor):
if data == True:
# Check the header on the first payload sector.
header += in_f.read(0x83)
if not self._ast_payload_pattern.match(header[0x9000:0x9010]):
if not self._ast_payload_pattern.match(header[:0x10]):
raise Exception('missing header')
# Add to the header data.
# Subtract header from payload.
remaining, = struct.unpack('<I', header[-5:-1])
payload_size -= 0x83
@@ -325,7 +328,7 @@ class ASTExtractor(Extractor):
except:
pass
# Remove AST file.
# Remove AST image.
os.remove(file_path)
# Return destination directory path.