Version 3.4.2

Cargo.lock

@@ -3491,7 +3491,7 @@ dependencies = [
 
 [[package]]
 name = "objdiff-cli"
-version = "3.4.1"
+version = "3.4.2"
 dependencies = [
  "anyhow",
  "argp",
@@ -3514,7 +3514,7 @@ dependencies = [
 
 [[package]]
 name = "objdiff-core"
-version = "3.4.1"
+version = "3.4.2"
 dependencies = [
  "anyhow",
  "arm-attr",
@@ -3570,7 +3570,7 @@ dependencies = [
 
 [[package]]
 name = "objdiff-gui"
-version = "3.4.1"
+version = "3.4.2"
 dependencies = [
  "anyhow",
  "argp",
@@ -3608,7 +3608,7 @@ dependencies = [
 
 [[package]]
 name = "objdiff-wasm"
-version = "3.4.1"
+version = "3.4.2"
 dependencies = [
  "log",
  "objdiff-core",

Cargo.toml

@@ -14,7 +14,7 @@ default-members = [
 resolver = "3"
 
 [workspace.package]
-version = "3.4.1"
+version = "3.4.2"
 authors = ["Luke Street <luke@street.dev>"]
 edition = "2024"
 license = "MIT OR Apache-2.0"

objdiff-core/src/arch/arm.rs

@@ -224,12 +224,14 @@ impl Arch for ArchArm {
             }
 
             // Check how many bytes we can/should read
-            let num_code_bytes = if mode == unarm::ParseMode::Data {
+            let num_code_bytes = if data.len() >= 4 {
-                // 32-bit .word value should be aligned on a 4-byte boundary, otherwise use .hword
+                if mode == unarm::ParseMode::Data && address & 3 != 0 {
-                if address & 3 == 0 { 4 } else { 2 }
+                    // 32-bit .word value should be aligned on a 4-byte boundary, otherwise use .hword
-            } else if data.len() >= 4 {
+                    2
-                // Read 4 bytes even for Thumb, as the parser will determine if it's a 2 or 4 byte instruction
+                } else {
-                4
+                    // Read 4 bytes even for Thumb, as the parser will determine if it's a 2 or 4 byte instruction
+                    4
+                }
             } else if mode != unarm::ParseMode::Arm {
                 2
             } else {

objdiff-wasm/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "objdiff-wasm",
-      "version": "3.4.1",
+      "version": "3.4.2",
       "license": "MIT OR Apache-2.0",
       "devDependencies": {
         "@biomejs/biome": "^1.9.3",

objdiff-wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "A local diffing tool for decompilation projects.",
   "author": {
     "name": "Luke Street",