MEA v1.70.2 r142

v1.70.2 Fixed crash at Intel Engine Capsule images r142 CSSPS 04.00.04.181_HA_SKU3_PRD_REC CSSPS 04.00.04.181_HA_SKU3_PRD_OPR
platomav · Oct 20, 2018 · e51b4b9 · e51b4b9
1 parent b089905
commit e51b4b9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/Changelog DB.txt b/Changelog DB.txt
@@ -1,3 +1,8 @@
+r142
+
+CSSPS 04.00.04.181_HA_SKU3_PRD_REC
+CSSPS 04.00.04.181_HA_SKU3_PRD_OPR
+
 r141
 
 CSME 12.0.7.1122_CON_H_B_PRD_EXTR

diff --git a/Changelog MEA.txt b/Changelog MEA.txt
@@ -1,3 +1,7 @@
+v1.70.2 r142
+
+Fixed crash at Intel Engine Capsule images
+
 v1.70.1 r141
 
 Fixed a crash at CSE firmware unpacking

diff --git a/MEA.dat b/MEA.dat
@@ -1,5 +1,5 @@
 ***	ME Analyzer Engine Firmware Repository Database ***
-***	Revision r141 (2018-10-08 , 13:58) ***
+***	Revision r142 (2018-10-19 , 23:54) ***
 
 *** Converged Security Management Engine (CSME) ***
 
@@ -626,6 +626,9 @@
 04.00.04.288_PU_SKU3_PRD_REC_E5A9B3F16A7EF50227F72EFC915BE20DD6693DE2370F828DC4D9CE1515C48953
 04.00.04.288_PU_SKU3_PRD_OPR_09E0E40DC4B57299348ED58D6342921834DEB0E466AC1717E6FC88E22502E8D4
 04.00.04.288_PU_SKU3_PRD_EXTR_09E0E40DC4B57299348ED58D6342921834DEB0E466AC1717E6FC88E22502E8D4
+04.00.04.181_HA_SKU3_PRD_EXTR_040FD4AC804EFA828E65AB4D6EA8D7153DA4136991F43A410B7661EFC62C2986
+04.00.04.181_HA_SKU3_PRD_OPR_040FD4AC804EFA828E65AB4D6EA8D7153DA4136991F43A410B7661EFC62C2986
+04.00.04.181_HA_SKU3_PRD_REC_AC40A266C4D02E4B50CDD75269CD363883A9F3718C4321B7077B20F6E270D145
 04.00.04.177_HA_SKU3_PRD_EXTR_A07952A84948628D21B2686AD6DEC71C0DEA686C3721D39EAF6E7787A1429B90
 04.00.04.177_HA_SKU3_PRD_REC_31AE26E8C161C4B767B9B154FFF4AECCCF8A5B3A42D453E295EFA28FCB0AE528
 04.00.04.177_HA_SKU3_PRD_OPR_A07952A84948628D21B2686AD6DEC71C0DEA686C3721D39EAF6E7787A1429B90

diff --git a/MEA.py b/MEA.py
@@ -6,7 +6,7 @@
 Copyright (C) 2014-2018 Plato Mavropoulos
 """
 
-title = 'ME Analyzer v1.70.1'
+title = 'ME Analyzer v1.70.2'
 
 import os
 import re
@@ -4561,6 +4561,7 @@ def cse_anl_err(ext_err_msg, checked_hashes = None) :
 # noinspection PyUnusedLocal
 def mfs_anl(mfs_folder, mfs_start, mfs_end, variant) :
 	mfs_info = [] # MFS Initial Info Printing
+	mfs_err_stor = [] # MFS Initial Message Storage
 	mfs_buffer_init = reading[mfs_start:mfs_end] # MFS Initial Buffer
 
 	mfsb_hdr = get_struct(mfs_buffer_init, 0, MFS_Backup) # Check if input MFS is in MFS Backup state
@@ -4731,6 +4732,7 @@ def mfs_anl(mfs_folder, mfs_start, mfs_end, variant) :
 		if i in all_chunks_dict : all_mfs_sys[i * (chunk_size - 2):(i + 1) * (chunk_size - 2)] = bytearray(all_chunks_dict[i])
 
 	# Parse MFS System Volume Structure
+	if not all_chunks_dict : return mfs_err_stor, parsed_indexes, intel_cfg_mfs, mfs_info # The final System Area Buffer must not be empty
 	vol_hdr = get_struct(all_chunks_dict[0], 0, MFS_Volume_Header) # System Volume is at the LAST Index 0 Chunk (the dictionary does that automatically)
 	if param.me11_mod_extr :
 		print('\n%s' % vol_hdr.mfs_print()) # Print System Volume Structure Info during CSE Unpacking
@@ -6344,6 +6346,9 @@ def mass_scan(f_path) :
 							(start_man_match, end_man_match) = rec_man_match.span()
 							start_man_match += p_rec_fix[1] + 0xB # Add Recovery/Operational offset and 8680.{9} sanity check before .$MN2 or .$MAN
 							end_man_match += p_rec_fix[1]
+		else :
+			# More than two $FPT detected, probably Intel Engine Capsule image
+			mfs_found = False
 
 		# Check for extra $FPT Entries, wrong NumPartitions (0x2+ for SPS3 Checksum)
 		while reading[fpt_step + 0x2:fpt_step + 0xC] not in [b'\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF',b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'] :