Changeset 39103 in vbox

Timestamp:

Oct 25, 2011 6:25:32 AM (13 years ago)

Author:

vboxsync

Message:

Audio/coreaudio: more convenient memory allocation and release operations, initialization of variables.

File:

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

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

@@ -378 +378 @@
     pszTmp = CFStringGetCStringPtr(pCFString, kCFStringEncodingUTF8);
     if (pszTmp)
+    {
         /* On success make a copy */
         pszResult = RTStrDup(pszTmp);
+    }
     else
     {
         /* If the pointer isn't available directly, we have to make a copy. */
         cLen = CFStringGetLength(pCFString) + 1;
-        pszResult = RTMemAlloc(cLen * sizeof(char));
+        pszResult = RTMemAllocZTag(cLen * sizeof(char), RTSTR_TAG);
         if (!CFStringGetCString(pCFString, pszResult, cLen, kCFStringEncodingUTF8))
         {
-            RTMemFree(pszResult);
+            RTStrFree(pszResult);
             pszResult = NULL;
         }
@@ -641 +643 @@
     UInt32 uFlag = 0; /* for setting flags */
     CFStringRef name; /* for the temporary device name fetching */
-    char *pszName;
-    char *pszUID;
+    char *pszName = NULL;
+    char *pszUID = NULL;
     ComponentDescription cd; /* description for an audio component */
     Component cp; /* an audio component */
@@ -1464 +1466 @@
     UInt32 uFlag = 0; /* for setting flags */
     CFStringRef name; /* for the temporary device name fetching */
-    char *pszName;
-    char *pszUID;
+    char *pszName = NULL;
+    char *pszUID = NULL;
     ComponentDescription cd; /* description for an audio component */
     Component cp; /* an audio component */
@@ -1516 +1518 @@
             if (pszName && pszUID)
                 LogRel(("CoreAudio: Using input device: %s (UID: %s)\n", pszName, pszUID));
-            RTStrFree(pszUID);
+            if (pszUID)
+                RTStrFree(pszUID);
         }
-        RTStrFree(pszName);
+        if (pszName)
+            RTStrFree(pszName);
     }
     else