Fix crash when using callback for local cfmessageports.

ronaldoussoren · Jun 7, 2021 · 4bc28cd · 4bc28cd
1 parent 2f9b537
commit 4bc28cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/pyobjc-framework-Cocoa/Lib/CoreFoundation/_metadata.py b/pyobjc-framework-Cocoa/Lib/CoreFoundation/_metadata.py
@@ -462,7 +462,7 @@ def sel32or64(a, b):
             "arguments": {
                 2: {
                     "callable": {
-                        "retval": {"type": b"^{__CFData=}"},
+                        "retval": {"type": b"^{__CFData=}", "already_cfretained": 1},
                         "arguments": {
                             0: {"type": b"^{__CFMessagePort=}"},
                             1: {"type": b"i"},

diff --git a/pyobjc-framework-Cocoa/PyObjCTest/test_cfmessageport.py b/pyobjc-framework-Cocoa/PyObjCTest/test_cfmessageport.py
@@ -1,5 +1,4 @@
 import CoreFoundation
-import Foundation
 import objc
 from PyObjCTools.TestSupport import TestCase, min_os_level, expectedFailure
 
@@ -106,10 +105,7 @@ def callout(port, messageid, data, info):
                 err, data = CoreFoundation.CFMessagePortSendRequest(
                     cli,
                     99,
-                    # XXX: Passing NSData is a workaround, for some reason
-                    # passing a bytes object causes a crash at the end
-                    # of the test (when the autorelease pool is drained).
-                    Foundation.NSData.dataWithData_(b"message"),
+                    b"message",
                     1.0,
                     1.0,
                     CoreFoundation.kCFRunLoopDefaultMode,

diff --git a/pyobjc-framework-Cocoa/metadata/CoreFoundation.fwinfo b/pyobjc-framework-Cocoa/metadata/CoreFoundation.fwinfo
@@ -2476,7 +2476,7 @@
         }
        ],
        "retval": {
-        "typestr": "^{__CFData=}"
+        "typestr": "^{__CFData=}", "already_cfretained": true
        }
       }
      },