]> git.alsa-project.org Git - alsa-lib.git/commitdiff
Fix segfault with invalid meter plugin option
authorTakashi Iwai <tiwai@suse.de>
Wed, 19 Nov 2008 15:14:27 +0000 (16:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 19 Nov 2008 15:14:27 +0000 (16:14 +0100)
snd_pcm_meter_add_scope_conf() may cause a segfault when pcm_scope_type
isn't defined.

Initialize type_conf properly to avoid it.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/pcm/pcm_meter.c

index 0dedb423aa0426d17feb29e83056f172817f1afa..83d643a4884727085994b676e5ad3d704397be8b 100644 (file)
@@ -603,7 +603,7 @@ static int snd_pcm_meter_add_scope_conf(snd_pcm_t *pcm, const char *name,
        snd_config_iterator_t i, next;
        const char *id;
        const char *lib = NULL, *open_name = NULL, *str = NULL;
-       snd_config_t *c, *type_conf;
+       snd_config_t *c, *type_conf = NULL;
        int (*open_func)(snd_pcm_t *, const char *,
                         snd_config_t *, snd_config_t *) = NULL;
        snd_pcm_meter_t *meter = pcm->private_data;