scripting: fix missing retain on scripted object

Fixes #5963
utmapp · Mar 31, 2024 · 2724075 · 2724075
1 parent 412878a
commit 2724075
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/Scripting/UTMScriptingGuestFileImpl.swift b/Scripting/UTMScriptingGuestFileImpl.swift
@@ -22,17 +22,14 @@ 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
         self.parent = parent
     }
 
     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
@@ -21,17 +21,14 @@ 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
         self.parent = parent
     }
 
     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)