frida-java-bridge 6.3.1 → 6.3.3

package/lib/android.js

@@ -591,8 +591,9 @@ function _getArtRuntimeSpec (api) {
    * gc::Heap* heap_;                <-- we need to find this
    * std::unique_ptr<ArenaPool> jit_arena_pool_;     <----- API level >= 24
    * std::unique_ptr<ArenaPool> arena_pool_;             __
-   * std::unique_ptr<ArenaPool> low_4gb_arena_pool_; <--|__ API level >= 23
+   * std::unique_ptr<ArenaPool> low_4gb_arena_pool_/linear_alloc_arena_pool_; <--|__ API level >= 23
    * std::unique_ptr<LinearAlloc> linear_alloc_;         \_
+   * std::atomic<LinearAlloc*> startup_linear_alloc_;<----- API level >= 34
    * size_t max_spins_before_thin_lock_inflation_;
    * MonitorList* monitor_list_;
    * MonitorPool* monitor_pool_;
@@ -644,7 +645,9 @@ function _getArtRuntimeSpec (api) {
         const threadListOffset = internTableOffset - pointerSize;
 
         let heapOffset;
-        if (apiLevel >= 24) {
+        if (apiLevel >= 34) {
+          heapOffset = threadListOffset - (9 * pointerSize);
+        } else if (apiLevel >= 24) {
           heapOffset = threadListOffset - (8 * pointerSize);
         } else if (apiLevel >= 23) {
           heapOffset = threadListOffset - (7 * pointerSize);
@@ -1890,6 +1893,11 @@ function ensureArtKnowsHowToHandleReplacementMethods (vm) {
 
   if (exportName !== null) {
     Interceptor.attach(Module.getExportByName('libart.so', exportName), artController.hooks.Gc.copyingPhase);
+
+    const collectorCMC = Module.findExportByName('libart.so', '_ZN3art2gc9collector11MarkCompact15CompactionPhaseEv');
+    if (collectorCMC !== null) {
+      Interceptor.attach(collectorCMC, artController.hooks.Gc.copyingPhase);
+    }
   }
 }
 

package/lib/mkdex.js

@@ -655,6 +655,7 @@ function computeModel (classes) {
       stringToIndex[fieldName]
     ];
   });
+  fieldItems.sort(compareFieldItems);
 
   const methodItems = methods.map(method => {
     const [klass, protoId, name, annotationsId] = method;
@@ -744,7 +745,7 @@ function computeModel (classes) {
     const instanceFields = fieldItems.reduce((result, field, index) => {
       const [holder] = field;
       if (holder === classIndex) {
-        result.push([index, kAccPublic]);
+        result.push([index > 0 ? 1 : 0, kAccPublic]);
       }
       return result;
     }, []);
@@ -848,6 +849,21 @@ function compareProtoItems (a, b) {
   return 0;
 }
 
+function compareFieldItems (a, b) {
+  const [aClass, aType, aName] = a;
+  const [bClass, bType, bName] = b;
+
+  if (aClass !== bClass) {
+    return aClass - bClass;
+  }
+
+  if (aName !== bName) {
+    return aName - bName;
+  }
+
+  return aType - bType;
+}
+
 function compareMethodItems (a, b) {
   const [aClass, aProto, aName] = a;
   const [bClass, bProto, bName] = b;

package/package.json

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