HighCapable/YukiHookAPI
5
0
Fork 0
mirror of https://github.com/HighCapable/YukiHookAPI.git synced 2025-09-04 09:45:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DexClassFinder conditions bug in ReflectionTool

Browse Source
This commit is contained in:
fankesyooni
2022-09-28 18:39:50 +08:00
parent 64927667ad
commit 759b6f290b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/tools/ReflectionTool.kt
View File

@@ -188,7 +188,7 @@ internal object ReflectionTool {
var numberOfFound = 0 var numberOfFound = 0
if (rule.isInitialize) forEach { field -> if (rule.isInitialize) forEach { field ->
rule.conditions { rule.conditions {
value.type?.also { value.exists(it) and (it == field.type) } value.type?.takeIf { value.exists(it) }?.also { and(it == field.type) }
value.name.takeIf { it.isNotBlank() }?.also { and(it == field.name) } value.name.takeIf { it.isNotBlank() }?.also { and(it == field.name) }
value.modifiers?.also { and(it(field.cast())) } value.modifiers?.also { and(it(field.cast())) }
value.nameConditions?.also { field.name.also { n -> and(it(n.cast(), n)) } } value.nameConditions?.also { field.name.also { n -> and(it(n.cast(), n)) } }
@@ -203,11 +203,11 @@ internal object ReflectionTool {
if (rule.isInitialize) forEach { method -> if (rule.isInitialize) forEach { method ->
rule.conditions { rule.conditions {
value.name.takeIf { it.isNotBlank() }?.also { and(it == method.name) } value.name.takeIf { it.isNotBlank() }?.also { and(it == method.name) }
value.returnType?.also { value.exists(it) and (it == method.returnType) } value.returnType?.takeIf { value.exists(it) }?.also { and(it == method.returnType) }
value.paramCount.takeIf { it >= 0 }?.also { and(method.parameterTypes.size == it) } value.paramCount.takeIf { it >= 0 }?.also { and(method.parameterTypes.size == it) }
value.paramCountRange.takeIf { it.isEmpty().not() }?.also { and(method.parameterTypes.size in it) } value.paramCountRange.takeIf { it.isEmpty().not() }?.also { and(method.parameterTypes.size in it) }
value.paramCountConditions?.also { method.parameterTypes.size.also { s -> and(it(s.cast(), s)) } } value.paramCountConditions?.also { method.parameterTypes.size.also { s -> and(it(s.cast(), s)) } }
value.paramTypes?.also { value.exists(*it) and (paramTypesEq(it, method.parameterTypes)) } value.paramTypes?.takeIf { value.exists(*it) }?.also { and(paramTypesEq(it, method.parameterTypes)) }
value.modifiers?.also { and(it(method.cast())) } value.modifiers?.also { and(it(method.cast())) }
value.nameConditions?.also { method.name.also { n -> and(it(n.cast(), n)) } } value.nameConditions?.also { method.name.also { n -> and(it(n.cast(), n)) } }
}.finally { numberOfFound++ } }.finally { numberOfFound++ }
@@ -223,7 +223,7 @@ internal object ReflectionTool {
value.paramCount.takeIf { it >= 0 }?.also { and(constructor.parameterTypes.size == it) } value.paramCount.takeIf { it >= 0 }?.also { and(constructor.parameterTypes.size == it) }
value.paramCountRange.takeIf { it.isEmpty().not() }?.also { and(constructor.parameterTypes.size in it) } value.paramCountRange.takeIf { it.isEmpty().not() }?.also { and(constructor.parameterTypes.size in it) }
value.paramCountConditions?.also { constructor.parameterTypes.size.also { s -> and(it(s.cast(), s)) } } value.paramCountConditions?.also { constructor.parameterTypes.size.also { s -> and(it(s.cast(), s)) } }
value.paramTypes?.also { value.exists(*it) and (paramTypesEq(it, constructor.parameterTypes)) } value.paramTypes?.takeIf { value.exists(*it) }?.also { and(paramTypesEq(it, constructor.parameterTypes)) }
value.modifiers?.also { and(it(constructor.cast())) } value.modifiers?.also { and(it(constructor.cast())) }
}.finally { numberOfFound++ } }.finally { numberOfFound++ }
}.run { rule.matchCount(numberOfFound) { and(it && numberOfFound > 0) } } }.run { rule.matchCount(numberOfFound) { and(it && numberOfFound > 0) } }