frida-java-bridge 5.1.0 → 5.2.0

package/lib/android.js

@@ -1541,7 +1541,7 @@ set_replacement_method (gpointer original_method,
   g_mutex_lock (&lock);
 
   g_hash_table_insert (methods, original_method, replacement_method);
-  g_hash_table_add (replacements, replacement_method);
+  g_hash_table_insert (replacements, replacement_method, original_method);
 
   g_mutex_unlock (&lock);
 }
@@ -1563,6 +1563,20 @@ delete_replacement_method (gpointer original_method)
   g_mutex_unlock (&lock);
 }
 
+gpointer
+translate_method (gpointer method)
+{
+  gpointer translated_method;
+
+  g_mutex_lock (&lock);
+
+  translated_method = g_hash_table_lookup (replacements, method);
+
+  g_mutex_unlock (&lock);
+
+  return (translated_method != NULL) ? translated_method : method;
+}
+
 gpointer
 find_replacement_method_from_quick_code (gpointer method,
                                          gpointer thread)
@@ -1691,6 +1705,7 @@ on_leave_gc_concurrent_copying_copying_phase (GumInvocationContext * ic)
       get: new NativeFunction(cm.get_replacement_method, 'pointer', ['pointer'], fastOptions),
       set: new NativeFunction(cm.set_replacement_method, 'void', ['pointer', 'pointer'], fastOptions),
       delete: new NativeFunction(cm.delete_replacement_method, 'void', ['pointer'], fastOptions),
+      translate: new NativeFunction(cm.translate_method, 'pointer', ['pointer'], fastOptions),
       findReplacementFromQuickCode: cm.find_replacement_method_from_quick_code
     },
     getOatQuickMethodHeaderImpl,
@@ -1793,6 +1808,10 @@ function makeMethodMangler (methodId) {
   return new MethodMangler(methodId);
 }
 
+function translateMethod (methodId) {
+  return artController.replacedMethods.translate(methodId);
+}
+
 function revertGlobalPatches () {
   patchedClasses.forEach(entry => {
     entry.vtablePtr.writePointer(entry.vtable);
@@ -4045,6 +4064,7 @@ module.exports = {
   ArtStackVisitor,
   ArtMethod,
   makeMethodMangler,
+  translateMethod,
   revertGlobalPatches,
   deoptimizeEverything,
   deoptimizeBootImage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-java-bridge",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "Java runtime interop from Frida",
   "main": "index.js",
   "files": [