[Iaxclient-cvs] SF.net SVN: iaxclient: [1242] branches/2.0/lib/audio_portaudio.c

[<sb...@us...>]

Revision: 1242
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1242&view=rev
Author:   sbalea
Date:     2007-10-30 11:18:45 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
Merge from trunk: fix memory leak in PortAudio destroy.

Modified Paths:
--------------
    branches/2.0/lib/audio_portaudio.c

Modified: branches/2.0/lib/audio_portaudio.c
===================================================================
--- branches/2.0/lib/audio_portaudio.c	2007-10-30 18:16:53 UTC (rev 1241)
+++ branches/2.0/lib/audio_portaudio.c	2007-10-30 18:18:45 UTC (rev 1242)
@@ -969,6 +969,24 @@
 
 static int pa_destroy(struct iaxc_audio_driver *d)
 {
+	if( iMixer )
+	{
+		Px_CloseMixer(iMixer);
+		iMixer = NULL;
+	}
+	if ( oMixer )
+	{
+		Px_CloseMixer(oMixer);
+		oMixer = NULL;
+	}
+	if ( d )
+	{
+		if ( d->devices )
+		{
+			free(d->devices);
+			d->devices= NULL;
+		}
+	}
 	return Pa_Terminate();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.