On Tue, Nov 27, 2018 at 08:16:30AM -0600, Rob Herring wrote: > Commit 3616b9a811b6 ("checks: Use source position information for check > failures") causes crashes when there's a check message with multiple > source annotations. Drop the errant addition to the str pointer left > over from the previous version. > > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> Applied. Although, 1) I don't think "errant" means what you think it means (granted, some IBM doc authors appear to have the same delusion) 2) A test would be nice. > --- > checks.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/checks.c b/checks.c > index 4dfdf485ea87..4834e44b37b2 100644 > --- a/checks.c > +++ b/checks.c > @@ -123,7 +123,7 @@ static inline void PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti, > pos = pos->next; > > file_str = srcpos_string(pos); > - str += xasprintf_append(&str, " also defined at %s\n", file_str); > + xasprintf_append(&str, " also defined at %s\n", file_str); > free(file_str); > } > } -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature