Skip to content

Fix crash by non-classfile language checks #27

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix crash by non-classfile language checks #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73a617d
Fix crash by non-classfile language checks
sschr15 Aug 31, 2024
b2b2ebe
Rethrow control flow exceptions
sschr15 Aug 31, 2024
e83039b
Don't try/catch, instead don't attempt to read the language on non-cl…
sschr15 Aug 31, 2024
e133e8a
Prevent accepting non-class files in the first place
sschr15 Aug 31, 2024
e99cf6c
Prevent accepting non-class files in the first place
sschr15 Aug 31, 2024
4e59840
Use IDEA's ArrayUtil for byte check
sschr15 Aug 31, 2024
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
4 changes: 4 additions & 0 deletions src/main/kotlin/org/vineflower/ijplugin/VineflowerDecompilerBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ abstract class VineflowerDecompilerBase : ClassFileDecompilers.Full() {
abstract val sourceFileType: FileType

override fun accepts(file: VirtualFile): Boolean {
if (file.extension != "class") {
return false
}

val state = VineflowerState.getInstance()
if (!state.enabled || state.hadError) {
return false
Expand Down
10 changes: 9 additions & 1 deletion src/main/kotlin/org/vineflower/ijplugin/VineflowerInvoker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.readBytes
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiClass
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.util.ArrayUtil
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.LinkedBlockingQueue
Expand Down Expand Up @@ -250,7 +251,14 @@ class VineflowerInvoker(classLoader: ClassLoader) {
private val getCurrentDecompContext = classLoader.loadClass("org.jetbrains.java.decompiler.main.DecompilerContext")
.getMethod("getCurrentContext")

fun getLanguage(bytes: ByteArray): String {
private val cafebabe = listOf(0xCA, 0xFE, 0xBA, 0xBE).map(Int::toByte).toByteArray()

fun getLanguage(bytes: ByteArray): String? {
if (ArrayUtil.startsWith(bytes, cafebabe)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test this? This condition is inverted

// Non-class file
return null
}

// ensure a decompilation context is available (otherwise the structclass constructor will fail)
if (getCurrentDecompContext.invoke(null) == null) {
val empty = emptyMap<Nothing, Nothing>()
Expand Down