]> git.alsa-project.org Git - alsa-lib.git/commitdiff
Fixed an access to uninitialized variable in pcm_rate.c
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Mar 2007 12:31:46 +0000 (14:31 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Mar 2007 12:31:46 +0000 (14:31 +0200)
Fixed an access to uninitialized variable in pcm_rate.c (in error message).

src/pcm/pcm_rate.c

index a1ebfddeeeea7b6a9e527cb0eb5267f0d658c741..8e8fb06a17e96ceb050654e173ff059169e47b53 100644 (file)
@@ -1322,7 +1322,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
 {
        snd_pcm_t *pcm;
        snd_pcm_rate_t *rate;
-       const char *type;
+       const char *type = NULL;
        int err;
 #ifndef PIC
        snd_pcm_rate_open_func_t open_func;
@@ -1355,8 +1355,10 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
                const char **types;
                for (types = default_rate_plugins; *types; types++) {
                        err = rate_open_func(rate, *types);
-                       if (!err)
+                       if (!err) {
+                               type = *types;
                                break;
+                       }
                }
        } else if (!snd_config_get_string(converter, &type))
                err = rate_open_func(rate, type);
@@ -1381,6 +1383,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
                return -ENOENT;
        }
 #else
+       type = "linear";
        open_func = SND_PCM_RATE_PLUGIN_ENTRY(linear);
        err = open_func(SND_PCM_RATE_PLUGIN_VERSION, &rate->obj, &rate->ops);
        if (err < 0) {