Re: [PATCH BlueZ 1/2] shared/shell: Return NULL if generator error occur

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Eramoto,

On Mon, Mar 19, 2018 at 6:46 AM, ERAMOTO Masaya
<eramoto.masaya@xxxxxxxxxxxxxx> wrote:
> Explicitly returns NULL if asprintf() fails, since the asprintf(3)
> man-page says that the contents of the first argument are undefined if
> any error occurs.
> ---
>  src/shared/shell.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/shared/shell.c b/src/shared/shell.c
> index 0a05b5215..7417e7ab4 100644
> --- a/src/shared/shell.c
> +++ b/src/shared/shell.c
> @@ -643,8 +643,13 @@ static char *cmd_generator(const char *text, int state)
>         }
>
>         cmd = find_cmd(text + strlen(menu->name) + 1, menu->entries, &index);
> -       if (cmd)
> -               asprintf(&cmd, "%s.%s", menu->name, cmd);
> +       if (cmd) {
> +               int err;
> +
> +               err = asprintf(&cmd, "%s.%s", menu->name, cmd);
> +               if (err < 0)
> +                       return NULL;
> +       }
>
>         return cmd;
>  }
> --
> 2.14.1

Applied, thanks.

-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux