From b563cf7d83d16d913677a98953fbb40db75d99a3 Mon Sep 17 00:00:00 2001
From: Mike Welsh <mwelsh@gmail.com>
Date: Fri, 16 Dec 2016 15:57:29 -0800
Subject: [PATCH] Implement DefineBits and JpegTables tags

---
 src/read.rs                             |  15 ++++++++
 src/tag_codes.rs                        |   2 +-
 src/test_data.rs                        |  47 ++++++++++++++++++++++++
 src/types.rs                            |   3 +-
 src/write.rs                            |  11 ++++++
 tests/swfs/DefineBits-JpegTables-MX.fla | Bin 0 -> 13312 bytes
 tests/swfs/DefineBits-JpegTables-MX.swf | Bin 0 -> 727 bytes
 7 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 tests/swfs/DefineBits-JpegTables-MX.fla
 create mode 100644 tests/swfs/DefineBits-JpegTables-MX.swf

diff --git a/src/read.rs b/src/read.rs
index 62ff18fd4..04c3e7fe5 100644
--- a/src/read.rs
+++ b/src/read.rs
@@ -409,6 +409,15 @@ impl<R: Read> Reader<R> {
                     data: data,
                 }
             },
+            Some(TagCode::DefineBits) => {
+                let id = tag_reader.read_u16()?;
+                let mut jpeg_data = Vec::with_capacity(length - 2);
+                tag_reader.input.read_to_end(&mut jpeg_data)?;
+                Tag::DefineBits {
+                    id: id,
+                    jpeg_data: jpeg_data,
+                }
+            },
             Some(TagCode::DefineButton) => try!(tag_reader.read_define_button()),
             Some(TagCode::DefineButton2) => try!(tag_reader.read_define_button_2()),
             Some(TagCode::DefineButtonCxform) => {
@@ -500,6 +509,12 @@ impl<R: Read> Reader<R> {
                 Tag::ImportAssets { url: url, imports: imports }
             },
 
+            Some(TagCode::JpegTables) => {
+                let mut data = Vec::with_capacity(length);
+                tag_reader.input.read_to_end(&mut data)?;
+                Tag::JpegTables(data)
+            },
+
             Some(TagCode::Metadata) => Tag::Metadata(try!(tag_reader.read_c_string())),
 
             Some(TagCode::SetBackgroundColor) => {
diff --git a/src/tag_codes.rs b/src/tag_codes.rs
index b0d75dfa9..46c674981 100644
--- a/src/tag_codes.rs
+++ b/src/tag_codes.rs
@@ -10,7 +10,7 @@ pub enum TagCode {
     RemoveObject = 5,
     DefineBits = 6,
     DefineButton = 7,
-    JpefTables = 8,
+    JpegTables = 8,
     SetBackgroundColor = 9,
     DefineFont = 10,
     DefineText = 11,
diff --git a/src/test_data.rs b/src/test_data.rs
index 57899bdd2..7e8fc65a2 100644
--- a/src/test_data.rs
+++ b/src/test_data.rs
@@ -29,6 +29,19 @@ pub fn tag_tests() -> Vec<TagTestData> { vec![
         read_tag_bytes_from_file("tests/swfs/definebinarydata.swf", TagCode::DefineBinaryData)
     ),
 
+    (
+        1,
+        Tag::DefineBits {
+            id: 1,
+            jpeg_data: vec![
+                255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 255, 192,
+                0, 17, 8, 0, 5, 0, 6, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, 255, 218, 0, 12, 3, 1, 0, 2,
+                17, 3, 17, 0, 63, 0, 252, 215, 162, 138, 43, 248, 28, 255, 0, 180, 3, 255, 217
+            ],
+        },
+        read_tag_bytes_from_file("tests/swfs/DefineBits-JpegTables-MX.swf", TagCode::DefineBits)
+    ),
+
     (
         1,
         Tag::DefineButton(Box::new(Button {
@@ -538,6 +551,40 @@ pub fn tag_tests() -> Vec<TagTestData> { vec![
         read_tag_bytes_from_file("tests/swfs/importassets2.swf", TagCode::ImportAssets2)
     ),
 
+    (
+        1,
+        Tag::JpegTables(vec![
+            255, 216, 255, 219, 0, 67, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 255, 219, 0, 67, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            255, 196, 0, 31, 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5,
+            6, 7, 8, 9, 10, 11, 255, 196, 0, 181, 16, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1,
+            125, 1, 2, 3, 0, 4, 17, 5, 18, 33, 49, 65, 6, 19, 81, 97, 7, 34, 113, 20, 50, 129, 145,
+            161, 8, 35, 66, 177, 193, 21, 82, 209, 240, 36, 51, 98, 114, 130, 9, 10, 22, 23, 24,
+            25, 26, 37, 38, 39, 40, 41, 42, 52, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73,
+            74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116,
+            117, 118, 119, 120, 121, 122, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148,
+            149, 150, 151, 152, 153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179,
+            180, 181, 182, 183, 184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210,
+            211, 212, 213, 214, 215, 216, 217, 218, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+            234, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 255, 196, 0, 31, 1, 0, 3, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 255, 196, 0,
+            181, 17, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119, 0, 1, 2, 3, 17, 4, 5, 33,
+            49, 6, 18, 65, 81, 7, 97, 113, 19, 34, 50, 129, 8, 20, 66, 145, 161, 177, 193, 9, 35,
+            51, 82, 240, 21, 98, 114, 209, 10, 22, 36, 52, 225, 37, 241, 23, 24, 25, 26, 38, 39,
+            40, 41, 42, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87,
+            88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121,
+            122, 130, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148, 149, 150, 151, 152,
+            153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179, 180, 181, 182, 183,
+            184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210, 211, 212, 213, 214,
+            215, 216, 217, 218, 226, 227, 228, 229, 230, 231, 232, 233, 234, 242, 243, 244, 245,
+            246, 247, 248, 249, 250, 255, 217
+        ]),
+        read_tag_bytes_from_file("tests/swfs/DefineBits-JpegTables-MX.swf", TagCode::JpegTables)
+    ),
+
     (
         1,
         Tag::Metadata("aa!".to_string()),
diff --git a/src/types.rs b/src/types.rs
index 943313018..f9b1e2be0 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -293,6 +293,7 @@ pub enum Tag {
 
     Protect(Option<String>),
     DefineBinaryData { id: CharacterId, data: Vec<u8> },
+    DefineBits { id: CharacterId, jpeg_data: Vec<u8> },
     DefineButton(Box<Button>),
     DefineButton2(Box<Button>),
     DefineButtonColorTransform { id: CharacterId, color_transforms: Vec<ColorTransform> },
@@ -307,8 +308,8 @@ pub enum Tag {
     EnableDebugger(String),
     EnableTelemetry { password_hash: Vec<u8> },
     Metadata(String),
-
     ImportAssets { url: String, imports: Vec<ExportedAsset> },
+    JpegTables(Vec<u8>),
     SetBackgroundColor(Color),
     SetTabIndex { depth: Depth, tab_index: u16 },
     SoundStreamBlock(Vec<u8>),
diff --git a/src/write.rs b/src/write.rs
index 36974c763..d0c91bd78 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -413,6 +413,12 @@ impl<W: Write> Writer<W> {
                 try!(self.output.write_all(&data));
             },
 
+            &Tag::DefineBits { id, ref jpeg_data } => {
+                self.write_tag_header(TagCode::DefineBits, jpeg_data.len() as u32 + 2)?;
+                self.write_u16(id)?;
+                self.output.write_all(jpeg_data)?;
+            },
+
             &Tag::DefineButton(ref button) => {
                 try!(self.write_define_button(button))
             },
@@ -541,6 +547,11 @@ impl<W: Write> Writer<W> {
                 }
             },
 
+            &Tag::JpegTables(ref data) => {
+                self.write_tag_header(TagCode::JpegTables, data.len() as u32)?;
+                self.output.write_all(data)?;
+            },
+            
             &Tag::Metadata(ref metadata) => {
                 try!(self.write_tag_header(TagCode::Metadata, metadata.len() as u32 + 1));
                 try!(self.write_c_string(metadata));
diff --git a/tests/swfs/DefineBits-JpegTables-MX.fla b/tests/swfs/DefineBits-JpegTables-MX.fla
new file mode 100644
index 0000000000000000000000000000000000000000..472d823e34f896e1318fe0706d1c3ec2f1c9159e
GIT binary patch
literal 13312
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

literal 0
HcmV?d00001

diff --git a/tests/swfs/DefineBits-JpegTables-MX.swf b/tests/swfs/DefineBits-JpegTables-MX.swf
new file mode 100644
index 0000000000000000000000000000000000000000..07f3ff7dd4d2d7f42eafd1fbf2842597c374dc07
GIT binary patch
literal 727
zcmZ<@4`#g1#K2I&z#7lMz`uZjfrpX7nd$%k|MpCFK=J=K{@-SBW?-ZcfDEC~2u8;L
zM;PQ87#LY01~EVZBNH<VD;qlpCl@zR!BznVCPrpvCKhH^Ru&eZ>RO;Y1B)Q5kfNa@
zn{Z$vyHcTuQRBpg9Li1`4~hm|{Gei-RMf=DB_=K*DW$5WuA!-AVrph?VQJ;;;_Bw^
z;pr6|5*ijB5gC=7lA4yDk(pIoQd(ACQCZd8(%RPE(b+X=@|3C5rq7r;YtiB*OP4KQ
zv2xX>&0Dr^+rDGxu0w~996fgY#K}{aE?>EN?fQ+Iw;n!v{N(Ag=PzEq`uOSdm#^Qx
z|M>X}<S#}BW_b8OJci~kL7=~wSXh`@*g^hcWGV+@W<eHKMME|r$3XVPLSZGNMh+3D
zi3>L#<Wx2e`XHKAbdgI;#pI#tN08URJ|oU!O=S5D?lFYFZtiDv0eXfJl!_iO2za@9
zx&c!XNB~IuKfoZ!!NAJE#>}Y1z$D1XEXer(76T76Bap)^$Y9U#=lY^9?H@A#8MZM0
vzqy}54rme+g9EbyvjU?dBg0Jxpk5#l5Z-Wd)5(pNn=Kev8JR!^I{-xi=#tYs

literal 0
HcmV?d00001