frida-java-bridge 6.3.0 → 6.3.2

package/lib/class-factory.js

@@ -2193,6 +2193,7 @@ class DexFile {
     const file = new File(filePath, 'w');
     file.write(buffer.buffer);
     file.close();
+    setReadOnlyDex(filePath, factory);
 
     return new DexFile(filePath, fileValue, factory);
   }
@@ -2251,6 +2252,12 @@ function createTemporaryDex (factory) {
   return JFile.createTempFile(tempFileNaming.prefix, tempFileNaming.suffix + '.dex', cacheDirValue);
 }
 
+function setReadOnlyDex (filePath, factory) {
+  const JFile = factory.use('java.io.File');
+  const file = JFile.$new(filePath);
+  file.setWritable(false, false);
+}
+
 function getFactoryCache () {
   switch (factoryCache.state) {
     case 'empty': {

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.0",
+  "version": "6.3.2",
   "description": "Java runtime interop from Frida",
   "main": "index.js",
   "files": [