[alsa-devel] [PATCH] ucm: Fix segfault when device argument is missing from _sw{dev, mod}

Takashi Iwai tiwai at suse.de
Fri May 24 12:50:17 CEST 2013


At Fri, 24 May 2013 11:12:57 +0300,
Juho Hämäläinen wrote:
> 
> Signed-off-by: Juho Hämäläinen <juho.hamalainen at tieto.com>
> ---
>  src/ucm/main.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/ucm/main.c b/src/ucm/main.c
> index d38b7fa..74e1530 100644
> --- a/src/ucm/main.c
> +++ b/src/ucm/main.c
> @@ -1649,6 +1649,10 @@ int snd_use_case_set(snd_use_case_mgr_t *uc_mgr,
>                  } else {
>                          str = NULL;
>                  }
> +                if (!str) {
> +                    err = -EINVAL;
> +                    goto __end;
> +                }

It's more straightforward to fold the error path into the else block
in the above.


thanks,

Takashi

>                  if (check_identifier(identifier, "_swdev"))
>                          err = switch_device(uc_mgr, str, value);
>                  else if (check_identifier(identifier, "_swmod"))
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


More information about the Alsa-devel mailing list