Skip to content

Correctly handle null thisObject in VectorChain for static methods #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JingMatrix merged 1 commit into from
Apr 13, 2026
+9 −7
Merged

Correctly handle null thisObject in VectorChain for static methods #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xposed/libxposed
Open in desktop
Submodule libxposed updated 6 files
+2 −2 README.md
+1 −1 api/build.gradle.kts
+3 −9 api/proguard-rules.pro
+14 −1 api/src/main/java/io/github/libxposed/api/XposedInterface.java
+38 −10 api/src/main/java/io/github/libxposed/api/XposedModuleInterface.java
+23 −1 api/src/main/java/io/github/libxposed/api/package-info.java
14 changes: 8 additions & 6 deletions xposed/src/main/kotlin/org/matrix/vector/impl/hooks/VectorChain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ class VectorChain(

override fun getArg(index: Int): Any? = args[index]

override fun proceed(): Any? = proceedWith(thisObj ?: Any(), args)
override fun proceed(): Any? = internalProceed(thisObj, args)

override fun proceed(args: Array<Any?>): Any? = proceedWith(thisObj ?: Any(), args)
override fun proceed(args: Array<Any?>): Any? = internalProceed(thisObj, args)

override fun proceedWith(thisObject: Any): Any? = proceedWith(thisObject, args)
override fun proceedWith(thisObject: Any): Any? = internalProceed(thisObject, args)

override fun proceedWith(thisObject: Any, args: Array<Any?>): Any? {
override fun proceedWith(thisObject: Any, args: Array<Any?>): Any? = internalProceed(thisObject, args)

private fun internalProceed(thisObject: Any?, currentArgs: Array<Any?>): Any? {
proceedCalled = true

// Reached the end of the modern hooks; trigger the original executable (and legacy hooks)
Expand Down Expand Up @@ -86,7 +88,7 @@ class VectorChain(
t: Throwable,
record: VectorHookRecord,
nextChain: VectorChain,
recoveryThis: Any,
recoveryThis: Any?,
recoveryArgs: Array<Any?>,
): Any? {
// Check if the exception originated from downstream (lower hooks or original method)
Expand All @@ -103,7 +105,7 @@ class VectorChain(
if (!nextChain.proceedCalled) {
// Crash occurred before calling proceed(); skip hooker and continue the chain
Utils.logD("Hooker [$hookerName] crashed before proceed. Skipping.", t)
return nextChain.proceedWith(recoveryThis, recoveryArgs)
return nextChain.internalProceed(recoveryThis, recoveryArgs)
} else {
// Crash occurred after calling proceed(); suppress and restore downstream state
Utils.logD("Hooker [$hookerName] crashed after proceed. Restoring state.", t)
Expand Down
Loading