curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 19:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

no more access violation from freeing already freed memory

Browse Source
This commit is contained in:
minjaesong
2019-06-08 03:29:38 +09:00
parent 15cb42e26b
commit 30ae587554
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/gameworld/BlockLayer.kt
View File

@@ -16,6 +16,7 @@ open class BlockLayer(val width: Int, val height: Int) : Disposable {
unsafe = unsafeConstructor.newInstance()
}
private var unsafeArrayInitialised = false
private var unsafeArrayDestroyed = false
private var layerPtr = unsafe.allocateMemory(width * height * BYTES_PER_BLOCK.toLong())
@@ -135,8 +136,11 @@ open class BlockLayer(val width: Int, val height: Int) : Disposable {
fun isInBound(x: Int, y: Int) = (x >= 0 && y >= 0 && x < width && y < height)
override fun dispose() {
unsafe.freeMemory(layerPtr)
printdbg(this, "BlockLayer successfully freed")
if (!unsafeArrayDestroyed) {
unsafe.freeMemory(layerPtr)
unsafeArrayDestroyed = true
printdbg(this, "BlockLayer successfully freed")
}
}
companion object {