Fix thumb code detection

WorksButNotTested · Jul 8, 2024 · 1b3740c · 1b3740c
1 parent eebe983
commit 1b3740c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -293,13 +293,15 @@ RUN arm-none-linux-gnueabihf-gcc \
     -no-pie \
     -shared \
     -fPIC \
+    -marm \
     -o module.so \
     /root/module.c
 RUN arm-none-linux-gnueabihf-gcc \
     -g \
     -Wall \
     -Werror \
     -no-pie \
+    -marm \
     -o target \
     /root/target.c
 RUN mkdir /root/arm64

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frida-cshell",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Frida's CShell",
   "scripts": {
     "prepare": "npm run build && npm run version && npm run package && npm run copy",

diff --git a/src/cmdlets/assembly.ts b/src/cmdlets/assembly.ts
@@ -99,7 +99,7 @@ export class AssemblyCmdLet extends CmdLet {
 
   private isThumb(address: NativePointer): boolean {
     if (Process.arch !== 'arm') return false;
-    if (address.and(1) === ptr(0)) return false;
+    if (address.and(1).equals(ptr(0))) return false;
     return true;
   }