frida-java-bridge 7.0.2 → 7.0.3

package/lib/android.js

@@ -950,8 +950,6 @@ function tryGetArtClassLinkerSpec (runtime, runtimeSpec) {
 
   if (spec !== null) {
     cachedArtClassLinkerSpec = spec;
-  } else {
-    throw new Error('Unable to determine ClassLinker field offsets');
   }
 
   return spec;
@@ -965,27 +963,36 @@ export function getArtClassSpec (vm) {
     return null;
   }
 
-  if (apiLevel < 24) {
-    return null;
-  }
-
-  let base, cmo;
-  if (apiLevel >= 26) {
-    base = 40;
-    cmo = 116;
+  if (apiLevel >= 34) {
+    return {
+      offset: {
+        ifields: 0x28,
+        methods: 0x28 + 0x8,
+        sfields: 0,
+        copiedMethodsOffset: 0x6c,
+      }
+    };
+  } else if (apiLevel >= 26) {
+    return {
+      offset: {
+        ifields: 0x28,
+        methods: 0x28 + 0x8,
+        sfields: 0x28 + 0x10,
+        copiedMethodsOffset: 0x74,
+      }
+    };
+  } else if (apiLevel >= 24) {
+    return {
+      offset: {
+        ifields: 0x38,
+        methods: 0x38 + 0x8,
+        sfields: 0x38 + 0x10,
+        copiedMethodsOffset: 0x7c,
+      }
+    };
   } else {
-    base = 56;
-    cmo = 124;
+    return null;
   }
-
-  return {
-    offset: {
-      ifields: base,
-      methods: base + 8,
-      sfields: base + 16,
-      copiedMethodsOffset: cmo
-    }
-  };
 }
 
 function _getArtMethodSpec (vm) {

package/lib/class-model.js

@@ -263,6 +263,7 @@ model_new (jclass class_handle,
       art_api.class_offset_sfields
     };
     guint field_array_cursor;
+    gboolean merged_fields = art_api.class_offset_sfields == 0;
 
     elements = read_art_array (class_object, art_api.class_offset_methods, sizeof (gsize), NULL);
     n = *(guint16 *) (class_object + art_api.class_offset_copied_methods_offset);
@@ -297,7 +298,11 @@ model_new (jclass class_handle,
     {
       jboolean is_static;
 
-      is_static = field_array_cursor == 1;
+      if (field_arrays[field_array_cursor] == 0)
+        continue;
+
+      if (!merged_fields)
+        is_static = field_array_cursor == 1;
 
       elements = read_art_array (class_object, field_arrays[field_array_cursor], sizeof (guint32), &n);
       for (i = 0; i != n; i++)
@@ -311,6 +316,8 @@ model_new (jclass class_handle,
         id = elements + (i * art_api.field_size);
 
         access_flags = *(guint32 *) (id + art_api.field_offset_access_flags);
+        if (merged_fields)
+          is_static = (access_flags & kAccStatic) != 0;
         field = to_reflected_field (env, class_handle, id, is_static);
         name = call_object_method (env, field, java_api.field.get_name);
         name_str = get_string_utf_chars (env, name, NULL);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-java-bridge",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "Java runtime interop from Frida",
   "keywords": [
     "frida-gum",