From d31c4d90778eefa0219fab30451eb8b3f23e01a6 Mon Sep 17 00:00:00 2001
From: Vincent Brillault <git@lerya.net>
Date: Wed, 23 May 2018 22:02:23 +0200
Subject: [PATCH] oleform: extract caption from labels

---
 oletools/oleform.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/oletools/oleform.py b/oletools/oleform.py
index 9c0867a..99f9059 100644
--- a/oletools/oleform.py
+++ b/oletools/oleform.py
@@ -415,7 +415,21 @@ def consume_LabelControl(stream):
     cbLabel = stream.unpack('<H', 2)
     with stream.will_jump_to(cbLabel):
         propmask = LabelPropMask(stream.unpack('<L', 4))
-        # Skip the DataBlock and the ExtraDataBlock
+        # LabelDataBlock: [MS-OFORMS] 2.2.4.3
+        with stream.padded_struct():
+            propmask.consume(stream, [('fForeColor', 4), ('fBackColor', 4),
+                                      ('fVariousPropertyBits', 4)])
+            if propmask.fCaption:
+                caption_size = consume_CountOfBytesWithCompressionFlag(stream)
+            else:
+                caption_size = 0
+            propmask.consume(stream, [('fPicturePosition', 4), ('fMousePointer', 1),
+                                      ('fBorderColor', 4), ('fBorderStyle', 2),
+                                      ('fSpecialEffect', 2), ('fPicture', 2),
+                                      ('fAccelerator', 2), ('fMouseIcon', 2)])
+        # LabelExtraDataBlock: [MS-OFORMS] 2.2.4.4
+        caption = stream.read(caption_size)
+        stream.read(8)
     # LabelStreamData: [MS-OFORMS] 2.2.4.5
     if propmask.fPicture:
         consume_GuidAndPicture(stream)
@@ -423,6 +437,7 @@ def consume_LabelControl(stream):
         consume_GuidAndPicture(stream)
     # TextProps
     consume_TextProps(stream)
+    return caption
 
 def consume_ScrollBarControl(stream):
     # ScrollBarControl: [MS-OFORMS] 2.2.7.1
--
libgit2 0.21.4