Fix shaper segfault (#633)

* `managedString` might be inlined and garbage collected before the beginning of JNI call * add other missed `reachabilityBarrier`s
JetBrains · Dec 14, 2022 · a15632c · a15632c
1 parent c62037f
commit a15632c
Show file tree

Hide file tree

Showing 32 changed files with 521 additions and 274 deletions.
diff --git a/skiko/src/commonMain/kotlin/org/jetbrains/skia/Bitmap.kt b/skiko/src/commonMain/kotlin/org/jetbrains/skia/Bitmap.kt
@@ -70,10 +70,13 @@ class Bitmap internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
      */
     fun swap(other: Bitmap) {
         Stats.onNativeCall()
-        _nSwap(_ptr, getPtr(other))
-        _imageInfo = null
-        reachabilityBarrier(this)
-        reachabilityBarrier(other)
+        try {
+            _nSwap(_ptr, getPtr(other))
+            _imageInfo = null
+        } finally {
+            reachabilityBarrier(this)
+            reachabilityBarrier(other)
+        }
     }
 
     override val imageInfo: ImageInfo
@@ -685,6 +688,7 @@ class Bitmap internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
             )
             this
         } finally {
+            reachabilityBarrier(this)
             reachabilityBarrier(pixelRef)
         }
     }