Changeset 5134:98f78b24025e in roaraudio

Timestamp:

09/23/11 00:44:13 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed segfaul in PortAudio? driver(v19) if no device is found.

Files:

• ChangeLog (modified) (1 diff)
• roard/driver_portaudio.c (modified) (4 diffs)

ChangeLog

@@ -2 +2 @@
         * Fixed segfaul in FLAC cf (Closes: #177)
         * Fixed invalid pointer aliasing (Closes: #178)
+        * Fixed segfaul in PortAudio driver(v19) if no device is found.
 
 v. 0.4rc0 - Mon Sep 05 2011 15:25 CEST

roard/driver_portaudio.c

@@ -36 +36 @@
 #elif defined(ROAR_HAVE_PA19_VERSION_19)
  PaStreamParameters params;
+ const PaDeviceInfo * dev_info = NULL;
 #endif
  PaError err;
@@ -165 +166 @@
  return 0;
 #elif defined(ROAR_HAVE_PA19_VERSION_19)
+ err                              = paNoError;
+
  params.device                    = Pa_GetDefaultOutputDevice();
  params.channelCount              = info->channels;
  params.sampleFormat              = fmt;
- params.suggestedLatency          = Pa_GetDeviceInfo(params.device)->defaultLowOutputLatency;
+
+ if ( params.device != paNoDevice )
+  dev_info = Pa_GetDeviceInfo(params.device);
+
+ if ( dev_info != NULL ) {
+  params.suggestedLatency = dev_info->defaultLowOutputLatency;
+ } else {
+  err = paNoDevice;
+ }
+
  params.hostApiSpecificStreamInfo = NULL;
 
@@ -175 +187 @@
 
  // Sets up blocking I/O stream.
- err = Pa_OpenStream(&(self->stream),
-                     NULL,
-                     &params,
-                     info->rate,
-                     128 /*FIXME:frames*/,
-                     paClipOff,
-                     NULL,
-                     NULL
-                    );
-
- if ( err != paNoError && autoconfig ) {
-  params.sampleFormat = paInt16;
-  params.channelCount = 2;
-  info->codec         = ROAR_CODEC_DEFAULT;
-  info->bits          = 16;
-  info->channels      = 2;
-
+ if ( err == paNoError ) {
   err = Pa_OpenStream(&(self->stream),
                       NULL,
@@ -203 +199 @@
  }
 
+ if ( err != paNoError && err != paNoDevice && autoconfig ) {
+  params.sampleFormat = paInt16;
+  params.channelCount = 2;
+  info->codec         = ROAR_CODEC_DEFAULT;
+  info->bits          = 16;
+  info->channels      = 2;
+
+  err = Pa_OpenStream(&(self->stream),
+                      NULL,
+                      &params,
+                      info->rate,
+                      128 /*FIXME:frames*/,
+                      paClipOff,
+                      NULL,
+                      NULL
+                     );
+ }
+
  if ( err != paNoError ) {
   ROAR_ERR("driver_portaudio_open(*): Could not open PortAudio device: \"%s\".", Pa_GetErrorText(err));