From d29b5d3bc6e27277a79dcb7fd7f2617dccade0c7 Mon Sep 17 00:00:00 2001
From: Leonard Lesinski <84378319+Le0X8@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:38:19 +0100
Subject: [PATCH 1/2] fix: Fixed padding length calculation

---
 src/msbt/create.rs          |   6 +++---
 src/msbt/hashtables.rs      |  13 +++++++++++--
 tests/msbt.rs               |  12 ++++++++++++
 tests/samples/AN_3P_Fu.msbt | Bin 0 -> 16464 bytes
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 tests/samples/AN_3P_Fu.msbt

diff --git a/src/msbt/create.rs b/src/msbt/create.rs
index 0b1fb0b..0f9a54c 100644
--- a/src/msbt/create.rs
+++ b/src/msbt/create.rs
@@ -1,4 +1,4 @@
-use super::MsbtFileSource;
+use super::{hashtables::padding_len, MsbtFileSource};
 use dh::{recommended::*, Readable, Writable};
 use std::io::Result;
 
@@ -58,7 +58,7 @@ pub fn create<'a>(
     let pos = target.pos()?;
     let labels_size = pos - table_pos;
     target.write_u32le_at(labels_size_pos, labels_size as u32)?;
-    target.write_bytes(&vec![0xab; 16 - pos as usize % 16])?;
+    target.write_bytes(&vec![0xab; padding_len(pos) as usize])?;
 
     // attributes section
     if has_attr_section {
@@ -137,6 +137,6 @@ pub fn create<'a>(
     let pos = target.pos()?;
     let text_size = pos - table_pos;
     target.write_u32le_at(text_size_pos, text_size as u32)?;
-    target.write_bytes(&vec![0xab; 16 - pos as usize % 16])?;
+    target.write_bytes(&vec![0xab; padding_len(pos) as usize])?;
     Ok(())
 }
diff --git a/src/msbt/hashtables.rs b/src/msbt/hashtables.rs
index 6d971f6..01ddcf8 100644
--- a/src/msbt/hashtables.rs
+++ b/src/msbt/hashtables.rs
@@ -1,6 +1,15 @@
 use dh::{recommended::*, Readable};
 use std::{collections::HashMap, io::Result};
 
+pub fn padding_len(pos: u64) -> u64 {
+    let res = pos % 16;
+    if res == 0 {
+        0
+    } else {
+        16 - res
+    }
+}
+
 // https://zeldamods.org/wiki/Msbt#Labels_Section
 pub fn parse_label_block(
     reader: &mut dyn Readable,
@@ -33,7 +42,7 @@ pub fn parse_label_block(
 
     reader.to(table_start + size as u64)?;
     let pos = reader.pos()?;
-    reader.jump(16 - pos as i64 % 16)?;
+    reader.jump(padding_len(pos) as i64)?;
 
     Ok(labels)
 }
@@ -45,7 +54,7 @@ pub fn parse_attr_block(reader: &mut dyn Readable, big_endian: bool) -> Result<(
     let start = reader.pos()?;
     reader.jump(size as i64)?;
     let pos = reader.pos()?;
-    reader.jump(16 - pos as i64 % 16)?;
+    reader.jump(padding_len(pos) as i64)?;
 
     Ok((start, size as u64))
 }
diff --git a/tests/msbt.rs b/tests/msbt.rs
index 819ddca..34d2b06 100644
--- a/tests/msbt.rs
+++ b/tests/msbt.rs
@@ -37,6 +37,18 @@ fn msbt_secretary() {
     assert!(string.starts_with("Sure thing!"));
 }
 
+#[test]
+fn msbt_an_3p_fu() {
+    let mut reader = dh::file::open_r("tests/samples/AN_3P_Fu.msbt").unwrap();
+    let metadata = msbt::metadata(&mut reader).unwrap();
+    assert_eq!(metadata.files.len(), 56);
+
+    let mut target = dh::data::write_empty();
+    msbt::extract(&mut reader, &mut target, &metadata.files[31]).unwrap();
+    let string = String::from_utf8(dh::data::close(target)).unwrap();
+    assert!(string.starts_with("<{0003,0016,}>Oh!<{0007,0000,14000000}> That might work!"));
+}
+
 #[test]
 fn custom_msbt() {
     let mut file0 = dh::data::read_ref(b"Hello, world!");
diff --git a/tests/samples/AN_3P_Fu.msbt b/tests/samples/AN_3P_Fu.msbt
new file mode 100644
index 0000000000000000000000000000000000000000..a0b57f0c551070475a54465b57ba4b3d41ebe29a
GIT binary patch
literal 16464
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

literal 0
HcmV?d00001


From 0fcbd86bba92945543a263be67ff075c8237009f Mon Sep 17 00:00:00 2001
From: Leonard Lesinski <84378319+Le0X8@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:38:43 +0100
Subject: [PATCH 2/2] chore: Updated version

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 26affba..23105ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "acridotheres-3ds"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "dh",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c1320d2..c1aaeb8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "acridotheres-3ds"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "Nintendo 3DS-specific file formats for Acridotheres"
 license = "MIT"