fix: inlined control flow function that isn't called

j4k0xb · Jul 19, 2024 · d04f0bf · d04f0bf
1 parent 05abe0c
commit d04f0bf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/packages/webcrack/src/deobfuscate/control-flow-object.ts b/packages/webcrack/src/deobfuscate/control-flow-object.ts
@@ -239,11 +239,10 @@ export default {
 
           if (t.isStringLiteral(value)) {
             path.replaceWith(value);
+          } else if (path.parentPath.isCallExpression()) {
+            inlineFunction(value, path.parentPath);
           } else {
-            inlineFunction(
-              value,
-              path.parentPath as NodePath<t.CallExpression>,
-            );
+            path.replaceWith(value);
           }
           this.changes++;
         },

diff --git a/packages/webcrack/src/deobfuscate/test/control-flow-object.test.ts b/packages/webcrack/src/deobfuscate/test/control-flow-object.test.ts
@@ -14,6 +14,18 @@ test('inlined object', () => {
     }).QuFtJ(u, undefined);
   `).toMatchInlineSnapshot(`u === undefined;`);
 
+  expectJS(`
+    a = ({
+      QuFtJ: function (n, r) {
+        return n === r;
+      }
+    }).QuFtJ;
+  `).toMatchInlineSnapshot(`
+    a = function (n, r) {
+      return n === r;
+    };
+  `);
+
   expectJS(`
     ({ YhxvC: "default" }).YhxvC;
   `).toMatchInlineSnapshot(`"default";`);