From 2724075c57126dd9b6e8f2b6e5468d7c3ff34da6 Mon Sep 17 00:00:00 2001
From: osy <50960678+osy@users.noreply.github.com>
Date: Sat, 30 Mar 2024 17:38:34 -0700
Subject: [PATCH] scripting: fix missing retain on scripted object

Fixes #5963
---
 Scripting/UTMScriptingGuestFileImpl.swift    | 15 ++++++---------
 Scripting/UTMScriptingGuestProcessImpl.swift |  7 ++-----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Scripting/UTMScriptingGuestFileImpl.swift b/Scripting/UTMScriptingGuestFileImpl.swift
index 4ce1aeb9f..1e0f8d9d4 100644
--- a/Scripting/UTMScriptingGuestFileImpl.swift
+++ b/Scripting/UTMScriptingGuestFileImpl.swift
@@ -22,7 +22,7 @@ import QEMUKitInternal
 class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
     @objc private(set) var id: Int
     
-    weak private var parent: UTMScriptingVirtualMachineImpl?
+    private var parent: UTMScriptingVirtualMachineImpl
     
     init(from handle: Int, parent: UTMScriptingVirtualMachineImpl) {
         self.id = handle
@@ -30,9 +30,6 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
     }
     
     override var objectSpecifier: NSScriptObjectSpecifier? {
-        guard let parent = parent else {
-            return nil
-        }
         guard let parentDescription = parent.classDescription as? NSScriptClassDescription else {
             return nil
         }
@@ -66,7 +63,7 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
         let isBase64Encoded = command.evaluatedArguments?["isBase64Encoded"] as? Bool ?? false
         let isClosing = command.evaluatedArguments?["isClosing"] as? Bool ?? true
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             defer {
@@ -96,7 +93,7 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
         let file = command.evaluatedArguments?["file"] as? URL
         let isClosing = command.evaluatedArguments?["isClosing"] as? Bool ?? true
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             defer {
@@ -129,7 +126,7 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
         let isBase64Encoded = command.evaluatedArguments?["isBase64Encoded"] as? Bool ?? false
         let isClosing = command.evaluatedArguments?["isClosing"] as? Bool ?? true
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             defer {
@@ -153,7 +150,7 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
         let file = command.evaluatedArguments?["file"] as? URL
         let isClosing = command.evaluatedArguments?["isClosing"] as? Bool ?? true
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             defer {
@@ -180,7 +177,7 @@ class UTMScriptingGuestFileImpl: NSObject, UTMScriptable {
     
     @objc func close(_ command: NSScriptCommand) {
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             try await guestAgent.guestFileClose(id)
diff --git a/Scripting/UTMScriptingGuestProcessImpl.swift b/Scripting/UTMScriptingGuestProcessImpl.swift
index 5125adf24..a37de274c 100644
--- a/Scripting/UTMScriptingGuestProcessImpl.swift
+++ b/Scripting/UTMScriptingGuestProcessImpl.swift
@@ -21,7 +21,7 @@ import Foundation
 class UTMScriptingGuestProcessImpl: NSObject, UTMScriptable {
     @objc private(set) var id: Int
     
-    weak private var parent: UTMScriptingVirtualMachineImpl?
+    private var parent: UTMScriptingVirtualMachineImpl
     
     init(from pid: Int, parent: UTMScriptingVirtualMachineImpl) {
         self.id = pid
@@ -29,9 +29,6 @@ class UTMScriptingGuestProcessImpl: NSObject, UTMScriptable {
     }
     
     override var objectSpecifier: NSScriptObjectSpecifier? {
-        guard let parent = parent else {
-            return nil
-        }
         guard let parentDescription = parent.classDescription as? NSScriptClassDescription else {
             return nil
         }
@@ -44,7 +41,7 @@ class UTMScriptingGuestProcessImpl: NSObject, UTMScriptable {
     
     @objc func getResult(_ command: NSScriptCommand) {
         withScriptCommand(command) { [self] in
-            guard let guestAgent = await parent?.guestAgent else {
+            guard let guestAgent = await parent.guestAgent else {
                 throw UTMScriptingVirtualMachineImpl.ScriptingError.guestAgentNotRunning
             }
             let status = try await guestAgent.guestExecStatus(id)