From 7efec74033f289c86875e2293c91503ebf27767d Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Sun, 2 Nov 2014 00:52:14 -0400 Subject: alsa: avoid uninitialized read The check if ( subdevice != -1 ) was being done on a potentially uninitialized variable. --- RtAudio.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'RtAudio.cpp') diff --git a/RtAudio.cpp b/RtAudio.cpp index af7d205..7bc009d 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -6815,6 +6815,7 @@ RtAudio::DeviceInfo RtApiAlsa :: getDeviceInfo( unsigned int device ) // Count cards and devices card = -1; + subdevice = -1; snd_card_next( &card ); while ( card >= 0 ) { sprintf( name, "hw:%d", card ); -- cgit v1.2.3 From 554c6c5035588852c98b10805a31ee5ba665721a Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Sun, 2 Nov 2014 00:56:12 -0400 Subject: rtaudio: avoid NULL dereference --- RtAudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'RtAudio.cpp') diff --git a/RtAudio.cpp b/RtAudio.cpp index 7bc009d..e9f7271 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -179,7 +179,7 @@ RtAudio :: RtAudio( RtAudio::Api api ) getCompiledApi( apis ); for ( unsigned int i=0; igetDeviceCount() ) break; + if ( rtapi_ && rtapi_->getDeviceCount() ) break; } if ( rtapi_ ) return; -- cgit v1.2.3