commit da29b6547f43863b8090ee96a4bb0d57687151c5
author Francois Gouget <fgouget@codeweavers.com> Mon Apr 26 23:31:11 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 26 23:31:11 2004 +0000
tree b048893b4e160dd8a4f17e28e46c6d7d3a96914d
parent d6c537b43c10eba6a141252acb42cab52b9121f3

Make sure the 'alsa handle' is initialized to NULL before calling
snd_pcm_open(). Otherwise if it fails we get a crash trying to close
an invalid alsa handle.

dlls/winmm/winealsa/audio.c

diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c
index af81e87..48bc7ad 100644
--- a/dlls/winmm/winealsa/audio.c
+++ b/dlls/winmm/winealsa/audio.c
@@ -522,7 +522,7 @@
  */
 LONG ALSA_WaveInit(void)
 {
-    snd_pcm_t*                  h = NULL;
+    snd_pcm_t*                  h;
     snd_pcm_info_t *            info;
     snd_pcm_hw_params_t *       hw_params;
     WINE_WAVEOUT*	        wwo;
@@ -555,6 +555,7 @@
 
 #define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0)
 
+    h = NULL;
     ALSA_WodNumDevs = 0;
     EXIT_ON_ERROR( snd_pcm_open(&h, wwo->device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) , "open pcm" );
     if (!h) return -1;
@@ -661,6 +662,7 @@
 
 #define EXIT_ON_ERROR(f,txt) do { int err; if ( (err = (f) ) < 0) { ERR(txt ": %s\n", snd_strerror(err)); if (h) snd_pcm_close(h); return -1; } } while(0)
 
+    h = NULL;
     ALSA_WidNumDevs = 0;
     EXIT_ON_ERROR( snd_pcm_open(&h, wwi->device, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK) , "open pcm" );
     if (!h) return -1;