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

Fix extraneous characters after Dell Phoenix version

Browse Source
This commit is contained in:
RichardG867
2022-01-01 16:51:34 -03:00
parent c9d2389c77
commit bef6b8472e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
biostools/analyzers.py
View File

@@ -1642,7 +1642,7 @@ class PhoenixAnalyzer(Analyzer):
offset = file_data.find(b'BCPSYS')
if offset > -1:
# Extract the build date and time as a string.
self.string = file_data[offset + 15:offset + 32].replace(b'\x00', b'\x20').decode('ascii', 'ignore').strip()
self.string = util.read_string(file_data[offset + 15:offset + 32].replace(b'\x00', b'\x20'))
# Discard if this is an invalid date/time (PHLASH.EXE)
if not self._bcpsys_datetime_pattern.match(self.string):
@@ -1657,8 +1657,9 @@ class PhoenixAnalyzer(Analyzer):
self.signon = '\n'
# Extract Dell version.
if file_data[offset + 0x20:offset + 0x21] == b'A':
self.signon += 'BIOS Version: ' + file_data[offset + 0x20:offset + 0x30].decode('ascii', 'ignore').rstrip('^\x00')
dell_version = util.read_string(file_data[offset + 0x20:offset + 0x23])
if dell_version[0:1] == 'A':
self.signon += 'BIOS Version: ' + dell_version
else:
# Extract sign-on from Core and some 4.0 Release 6.0 BIOSes.
match = self._core_signon_pattern.search(file_data)
@@ -1933,7 +1934,7 @@ class PhoenixAnalyzer(Analyzer):
if match.group(1): # the single captured character is a flag
self.signon = match.group(2) + self.signon[linebreak_index:]
else:
self.signon = self.signon[:linebreak_index + 1] + 'BIOS Version: ' + match.group(2)
self.signon = self.signon[:linebreak_index + 1] + 'BIOS Version: ' + match.group(2)[:3]
return True