Changeset 1362 for portaudio/branches

Timestamp:

02/28/08 16:43:57 (9 months ago)

Author:

aknudsen

Message:

Ensure stream validity in PaAlsa?_GetStream*Card

Files:

• portaudio/branches/v19-devel/src/hostapi/alsa/pa_linux_alsa.c (modified) (2 diffs)

portaudio/branches/v19-devel/src/hostapi/alsa/pa_linux_alsa.c

@@ -3531 +3531 @@
 #endif
 
+static PaError GetAlsaStreamPointer( PaStream* s, PaAlsaStream** stream )
+{
+    PaError result = paNoError;
+    PaUtilHostApiRepresentation* hostApi;
+    PaAlsaHostApiRepresentation* alsaHostApi;
+    
+    PA_ENSURE( PaUtil_ValidateStreamPointer( s ) );
+    PA_ENSURE( PaUtil_GetHostApiRepresentation( &hostApi, paALSA ) );
+    alsaHostApi = (PaAlsaHostApiRepresentation*)hostApi;
+    
+    PA_UNLESS( PA_STREAM_REP( s )->streamInterface == &alsaHostApi->callbackStreamInterface
+            || PA_STREAM_REP( s )->streamInterface == &alsaHostApi->blockingStreamInterface,
+        paIncompatibleStreamHostApi );
+
+    *stream = (PaAlsaStream*)s;
+error:
+    return paNoError;
+}
+
 PaError PaAlsa_GetStreamInputCard(PaStream* s, int* card) {
-    PaAlsaStream *stream = (PaAlsaStream *) s;
+    PaAlsaStream *stream;
+    PaError result = paNoError;
     snd_pcm_info_t* pcmInfo;
-    PaError result = paNoError;
+
+    PA_ENSURE( GetAlsaStreamPointer( s, &stream ) );
 
     /* XXX: More descriptive error? */
@@ -3548 +3569 @@
 
 PaError PaAlsa_GetStreamOutputCard(PaStream* s, int* card) {
-    PaAlsaStream *stream = (PaAlsaStream *) s;
+    PaAlsaStream *stream;
+    PaError result = paNoError;
     snd_pcm_info_t* pcmInfo;
-    PaError result = paNoError;
+
+    PA_ENSURE( GetAlsaStreamPointer( s, &stream ) );
 
     /* XXX: More descriptive error? */