Update of /cvsroot/audacity/lib-src/portmixer/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv29882/src
Modified Files:
px_mixer.c
Log Message:
Fix an access after free.
Index: px_mixer.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portmixer/src/px_mixer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- px_mixer.c 3 Jun 2007 08:50:05 -0000 1.3
+++ px_mixer.c 11 Jul 2007 06:16:16 -0000 1.4
@@ -186,9 +186,9 @@
/*
|| Mixer info
*/
-int Px_GetNumMixers( void *pa_stream )
+int Px_GetNumMixers(PxMixer *mixer)
{
- px_mixer *Px = verify_mixer(Px_OpenMixer(pa_stream, 0));
+ px_mixer *Px = verify_mixer(mixer);
int cnt;
if (!Px) {
@@ -197,14 +197,12 @@
cnt = Px->GetNumMixers(Px);
- Px_CloseMixer((PxMixer *)Px);
-
return cnt;
}
-const char *Px_GetMixerName( void *pa_stream, int i )
+const char *Px_GetMixerName(PxMixer *mixer, int i)
{
- px_mixer *Px = verify_mixer(Px_OpenMixer(pa_stream, 0));
+ px_mixer *Px = verify_mixer(mixer);
const char *name;
if (!Px) {
@@ -213,8 +211,6 @@
name = Px->GetMixerName(Px, i);
- Px_CloseMixer((PxMixer *)Px);
-
return name;
}
@@ -231,7 +227,7 @@
return Px->GetMasterVolume(Px);
}
-void Px_SetMasterVolume( PxMixer *mixer, PxVolume volume )
+void Px_SetMasterVolume(PxMixer *mixer, PxVolume volume)
{
px_mixer *Px = verify_mixer(mixer);
if (!Px)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
