DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

"Fix" random crash inside stbi_load_from_memory caused by JVM releasing DirectByteBuffer while it is being used

Browse Source
This commit is contained in:
DBotThePony 2024-02-02 15:47:42 +07:00
parent cb38ecfde7
commit bd8d0e58df
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
View File

@ -315,12 +315,16 @@ class Image private constructor(
val getHeight = intArrayOf(0) val getHeight = intArrayOf(0)
val components = intArrayOf(0) val components = intArrayOf(0)
val idata = it.readDirect()
val data = STBImage.stbi_load_from_memory( val data = STBImage.stbi_load_from_memory(
it.readDirect(), idata,
getWidth, getHeight, getWidth, getHeight,
components, 0 components, 0
) ?: throw IllegalArgumentException("File $it is not an image or it is corrupted") ) ?: throw IllegalArgumentException("File $it is not an image or it is corrupted")
synchronized(idata) {} // memory barrier
val address = MemoryUtil.memAddress(data) val address = MemoryUtil.memAddress(data)
Starbound.CLEANER.register(data) { STBImage.nstbi_image_free(address) } Starbound.CLEANER.register(data) { STBImage.nstbi_image_free(address) }