Steven, one more, please ack.
- Arnaldo
Em Mon, Oct 17, 2016 at 11:17:11PM +0900, Honggyu Kim escreveu:
> Since asprintf generates a compiler warning when its return value is not
> not properly handled, this patch checks that asprintf call is successful
> or not.
>
> Signed-off-by: Honggyu Kim <hong.gyu....@lge.com>
> ---
> tools/lib/traceevent/parse-filter.c | 29 +++++++++++++++++++----------
> 1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/tools/lib/traceevent/parse-filter.c
> b/tools/lib/traceevent/parse-filter.c
> index 7c214ce..f0fcdcd 100644
> --- a/tools/lib/traceevent/parse-filter.c
> +++ b/tools/lib/traceevent/parse-filter.c
> @@ -2122,7 +2122,8 @@ static char *op_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> default:
> break;
> }
> - asprintf(&str, val ? "TRUE" : "FALSE");
> + if (asprintf(&str, val ? "TRUE" : "FALSE") < 0)
> + return NULL;
> break;
> }
> }
> @@ -2140,7 +2141,8 @@ static char *op_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> break;
> }
>
> - asprintf(&str, "(%s) %s (%s)", left, op, right);
> + if (asprintf(&str, "(%s) %s (%s)", left, op, right) < 0)
> + return NULL;
> break;
>
> case FILTER_OP_NOT:
> @@ -2156,10 +2158,12 @@ static char *op_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> right_val = 0;
> if (right_val >= 0) {
> /* just return the opposite */
> - asprintf(&str, right_val ? "FALSE" : "TRUE");
> + if (asprintf(&str, right_val ? "FALSE" : "TRUE") < 0)
> + return NULL;
> break;
> }
> - asprintf(&str, "%s(%s)", op, right);
> + if (asprintf(&str, "%s(%s)", op, right) < 0)
> + return NULL;
> break;
>
> default:
> @@ -2175,7 +2179,8 @@ static char *val_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> {
> char *str = NULL;
>
> - asprintf(&str, "%lld", arg->value.val);
> + if (asprintf(&str, "%lld", arg->value.val) < 0)
> + return NULL;
>
> return str;
> }
> @@ -2233,7 +2238,8 @@ static char *exp_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> break;
> }
>
> - asprintf(&str, "%s %s %s", lstr, op, rstr);
> + if (asprintf(&str, "%s %s %s", lstr, op, rstr) < 0)
> + return NULL;
> out:
> free(lstr);
> free(rstr);
> @@ -2277,7 +2283,8 @@ static char *num_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> if (!op)
> op = "<=";
>
> - asprintf(&str, "%s %s %s", lstr, op, rstr);
> + if (asprintf(&str, "%s %s %s", lstr, op, rstr) < 0)
> + return NULL;
> break;
>
> default:
> @@ -2312,8 +2319,9 @@ static char *str_to_str(struct event_filter *filter,
> struct filter_arg *arg)
> if (!op)
> op = "!~";
>
> - asprintf(&str, "%s %s \"%s\"",
> - arg->str.field->name, op, arg->str.val);
> + if (asprintf(&str, "%s %s \"%s\"",
> + arg->str.field->name, op, arg->str.val) < 0)
> + return NULL;
> break;
>
> default:
> @@ -2329,7 +2337,8 @@ static char *arg_to_str(struct event_filter *filter,
> struct filter_arg *arg)
>
> switch (arg->type) {
> case FILTER_ARG_BOOLEAN:
> - asprintf(&str, arg->boolean.value ? "TRUE" : "FALSE");
> + if (asprintf(&str, arg->boolean.value ? "TRUE" : "FALSE") < 0)
> + return NULL;
> return str;
>
> case FILTER_ARG_OP:
> --
> 2.10.0.rc2.dirty
