From 19b795752372525bb811d9ea8c2de9bec3c28f9a Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 4 Jan 2019 14:57:31 +0000
Subject: [PATCH] Added RTF extractor

---
 src/core/lib/FileSignatures.mjs | 44 +++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/core/lib/FileSignatures.mjs b/src/core/lib/FileSignatures.mjs
index e55bd566..4409c96c 100644
--- a/src/core/lib/FileSignatures.mjs
+++ b/src/core/lib/FileSignatures.mjs
@@ -572,7 +572,7 @@ export const FILE_SIGNATURES = {
                 3: 0x74,
                 4: 0x66
             },
-            extractor: null
+            extractor: extractRTF
         },
         {
             name: "Microsoft Office documents/OLE2",
@@ -1307,7 +1307,7 @@ export function extractFLV(bytes, offset) {
     stream.moveForwardsBy(headerSize - 9);
 
     let tagSize = -11; // Fake size of previous tag header
-    while (stream.position < stream.length) {
+    while (stream.hasMore()) {
         const prevTagSize = stream.readInt(4, "be");
         const tagType = stream.readInt(1, "be");
 
@@ -1332,3 +1332,43 @@ export function extractFLV(bytes, offset) {
 
     return stream.carve();
 }
+
+
+/**
+ * RTF extractor.
+ *
+ * @param {Uint8Array} bytes
+ * @param {number} offset
+ * @returns {Uint8Array}
+ */
+export function extractRTF(bytes, offset) {
+    const stream = new Stream(bytes.slice(offset));
+
+    let openTags = 0;
+
+    if (stream.readInt(1, "be") !== 0x7b) { // {
+        throw new Error("Not a valid RTF file");
+    } else {
+        openTags++;
+    }
+
+    while (openTags > 0 && stream.hasMore()) {
+        switch (stream.readInt(1, "be")) {
+            case 0x7b: // {
+                openTags++;
+                break;
+            case 0x7d: // }
+                openTags--;
+                break;
+            case 0x5c: // \
+                // Consume any more escapes and then skip over the next character
+                stream.consumeIf(0x5c);
+                stream.position++;
+                break;
+            default:
+                break;
+        }
+    }
+
+    return stream.carve();
+}