ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-16 14:27:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(BytecodeUtils): due to structural limitations of ReVanced Patcher, incorrect classes may be retrieved

Browse Source
This commit is contained in:
inotia00 2024-09-06 19:42:21 +09:00
parent 4edfb1b6c6
commit 40082ce972
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/kotlin/app/revanced/util/BytecodeUtils.kt
View File

@ -604,13 +604,35 @@ fun MutableMethod.getTargetIndexWithReferenceReversed(startIndex: Int, reference
return -1
}
fun MethodFingerprintResult.getWalkerMethod(context: BytecodeContext, index: Int) =
mutableMethod.getWalkerMethod(context, index)
fun MethodFingerprintResult.getWalkerMethod(context: BytecodeContext, offset: Int) =
mutableMethod.getWalkerMethod(context, offset)
fun MutableMethod.getWalkerMethod(context: BytecodeContext, index: Int) =
context.toMethodWalker(this)
.nextMethod(index, true)
.getMethod() as MutableMethod
/**
* MethodWalker structural limitations cause incorrect class to be found
*
* MethodReference to find in YouTube 18.29.38:
* 'Lng;->d(Lou;)Z'
*
* Class found by MethodWalker in YouTube 18.29.38:
* 'Lcom/google/android/gms/maps/model/LatLng;'
*
* The reason this error occurs is because [BytecodeContext.findClass] checks whether className is included or not
*
* In ReVanced Patcher 19.3.1:
* fun findClass(className: String) = findClass { it.type.contains(className) }
*
* (Class 'Lcom/google/android/gms/maps/model/LatLng;' is returned because class 'Lcom/google/android/gms/maps/model/LatLng;' contains keyword 'Lng;')
*
* As a workaround, redefine MethodWalker here
*/
fun MutableMethod.getWalkerMethod(context: BytecodeContext, offset: Int): MutableMethod {
val newMethod = getInstruction<ReferenceInstruction>(offset).reference as MethodReference
return context.findClass { classDef -> classDef.type == newMethod.definingClass }
?.mutableClass
?.methods
?.first { method -> MethodUtil.methodSignaturesMatch(method, newMethod) }
?: throw PatchException("This method can not be walked at offset $offset inside the method $name")
}
fun MutableClass.addFieldAndInstructions(
context: BytecodeContext,