From c9de786d3be88b8e51fa2b3eb5eacc1a05697c91 Mon Sep 17 00:00:00 2001
From: yam-anssi <jeremy.richard@ssi.gouv.fr>
Date: Fri, 25 Nov 2016 18:45:38 +0100
Subject: [PATCH] Compressed data handling improved.

---
 README.md    |  1 +
 bmc-tools.py | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 538fd1c..1f0b403 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ With the following arguments meaning:
 ```
 ## Changelog
 ```
+25/11/2016		1.01	Compressed data handling improved.
 25/11/2016		1.00c	Unused variable removed.
 10/08/2016		1.00b	--dest parameter processing fixed.
 01/07/2016		1.00a	cacheXXXX.bin header detection fixed.
diff --git a/bmc-tools.py b/bmc-tools.py
index e3dacf0..1f03a7a 100755
--- a/bmc-tools.py
+++ b/bmc-tools.py
@@ -50,6 +50,7 @@ def b_process(self):
 		if len(self.bdat) == 0:
 			self.b_log(sys.stderr, False, 3, "Nothing to process.")
 			return False
+		bl = 0
 		while len(self.bdat) > 0:
 			old = False
 			o_bmp = ""
@@ -63,7 +64,23 @@ def b_process(self):
 				t_len, t_params = unpack("<LL", t_hdr[-0x8:])
 				if t_params & 0x08: #This bit is always ONE when relevant data is smaller than expected data, thus it is most likely the "compression" bit flag.
 					self.b_log(sys.stdout, False, 3, "Tile data is compressed (%d bytes compressed in %d bytes); skipping." % (t_width*t_height*4, t_len))
-					bl = 64*64*2
+					if bl == 0:
+						if "22.bmc" in self.fname:
+							bl = 64*64*2
+						elif "24.bmc" in self.fname:
+							bl = 64*64*4
+						elif "2.bmc" in self.fname:
+							bl = 64*64
+						else:
+							for b in [1, 2, 4]:
+								if len(self.bdat) < len(t_hdr)+64*64*b+8:
+									break
+								elif unpack("<H", self.bdat[len(t_hdr)+64*64*b+8:][:2])[0] == 64:
+									bl = 64*64*b
+									break
+							if bl == 0:
+								self.b_log(sys.stderr, False, 3, "Unable to determine data pattern size; exiting before throwing any error!")
+								return False
 				else:
 					cf = t_len/(t_width*t_height)
 					if cf not in [1, 2, 4]: