Changeset 945:facac9263129 in mediastreamer2

Timestamp:

Apr 14, 2010 1:12:16 PM (3 years ago)

Author:

Aymeric Moizard <jack@…>

Branch:

default

Message:

fix memory issue with duplicate

File:

• src/macsnd.c (modified) (3 diffs)

src/macsnd.c

@@ -134 +134 @@
 static MSSndCard *cacard_duplicate(MSSndCard * obj)
 {
+        CaSndDsCard *ca;
+        CaSndDsCard *cadup;
         MSSndCard *card = ms_snd_card_new(&ca_card_desc);
         card->name = ms_strdup(obj->name);
         card->data = ms_new0(CaSndDsCard, 1);
         memcpy(card->data, obj->data, sizeof(CaSndDsCard));
+        ca = obj->data;
+        cadup = card->data;
+        cadup->uidname = CFStringCreateCopy(NULL, ca->uidname);
         return card;
 }
@@ -576 +581 @@
         
         comp = FindNextComponent(NULL, &desc);
-        if (comp == NULL) return -1;
+        if (comp == NULL)
+        {
+                ms_message("Cannot find audio component");
+                return -1;
+        }
         
         result = OpenAComponent(comp, &d->caInAudioUnit);
-        if(result != noErr) return -1;
+        if(result != noErr)
+        {
+                ms_message("Cannot open audio component %x", result);
+                return -1;
+        }
         
         param = 1;
@@ -696 +709 @@
         
         comp = FindNextComponent(NULL, &desc);
-        if (comp == NULL) return -1;
+        if (comp == NULL)
+        {
+                ms_message("Cannot find audio component");
+                return -1;
+        }
         
         result = OpenAComponent(comp, &d->caOutAudioUnit);
-        if(result != noErr) return -1;
+        if(result != noErr)
+        {
+                ms_message("Cannot open audio component %x", result);
+                return -1;
+        }
         
         param = 1;