Changeset 39469 in vbox

Timestamp:

Nov 30, 2011 8:30:52 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75118

Message:

Audio/mac: proper fix for xTracker/5971.

File:

• trunk/src/VBox/Devices/Audio/coreaudio.c (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/coreaudio.c

@@ -371 +371 @@
 static char* caCFStringToCString(const CFStringRef pCFString)
 {
-    const char *pszTmp = NULL;
     char *pszResult = NULL;
     CFIndex cLen;
+#if 0
+    /**
+     * CFStringGetCStringPtr doesn't reliably return requested string instead return depends on "many factors" (not clear which)
+     * ( please follow the link
+     *  http://developer.apple.com/library/mac/#documentation/CoreFoundation/Reference/CFStringRef/Reference/reference.html
+     * for more details). Branch below allocates memory using mechanisms which hasn't got single method for memory free:
+     * RTStrDup - RTStrFree
+     * RTMemAllocZTag - RTMemFree
+     * which aren't compatible, opposite to CFStringGetCStringPtr CFStringGetCString has well defined
+     * behaviour and confident return value.
+     */
+    const char *pszTmp = NULL;
 
     /* First try to get the pointer directly. */
@@ -393 +404 @@
         }
     }
+#else
+    /* If the pointer isn't available directly, we have to make a copy. */
+    cLen = CFStringGetLength(pCFString) + 1;
+    pszResult = RTMemAllocZTag(cLen * sizeof(char), RTSTR_TAG);
+    if (!CFStringGetCString(pCFString, pszResult, cLen, kCFStringEncodingUTF8))
+    {
+        RTStrFree(pszResult);
+        pszResult = NULL;
+    }
+#endif
 
     return pszResult;
@@ -694 +715 @@
             if (pszName && pszUID)
                 LogRel(("CoreAudio: Using output device: %s (UID: %s)\n", pszName, pszUID));
-            RTStrFree(pszUID);
+            RTMemFree(pszUID);
         }
-        RTStrFree(pszName);
+        RTMemFree(pszName);
     }
     else
@@ -1519 +1540 @@
                 LogRel(("CoreAudio: Using input device: %s (UID: %s)\n", pszName, pszUID));
             if (pszUID)
-                RTStrFree(pszUID);
+                RTMemFree(pszUID);
         }
         if (pszName)
-            RTStrFree(pszName);
+            RTMemFree(pszName);
     }
     else