Fix early pointers release in curl engine

32ffa95c · Leonid Stashevsky · Leonid.Stashevsky · e6f6e5c6 · 32ffa95c · 32ffa95c
--- a/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlCallbacks.kt
+++ b/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlCallbacks.kt
@@ -34,8 +34,7 @@ internal fun onBodyChunkRequested(
    size: size_t, count: size_t,
    dataRef: COpaquePointer
 ): Long {
-    val streamRef = dataRef.asStableRef<ByteReadPacket>()
-    val body = streamRef.get()
+    val body: ByteReadPacket = dataRef.fromCPointer()
    val requested = (size * count).toLong()

    if (body.isEmpty) return 0

--- a/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlMultiApiHandler.kt
+++ b/ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlMultiApiHandler.kt
@@ -112,10 +112,12 @@ internal class CurlMultiApiHandler : Closeable {
                val easyHandle = message.easy_handle
                    ?: throw CurlIllegalStateException("Got a null easy handle from the message")

-                activeHandles[easyHandle]!!.dispose()
-                activeHandles.remove(easyHandle)
-
-                responseDataList += readResponseDataFromEasyHandle(message.msg, easyHandle)
+                try {
+                    responseDataList += readResponseDataFromEasyHandle(message.msg, easyHandle)
+                } finally {
+                    activeHandles[easyHandle]!!.dispose()
+                    activeHandles.remove(easyHandle)
+                }
            } while (messagesLeft.value != 0)
        }