diff options
| author | Petr Vorel <petr.vorel@gmail.com> | 2017-10-13 15:57:17 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-10-16 09:24:11 -0700 |
| commit | 24b058a2a4f5248becc3c148637a3644d11a65a9 (patch) | |
| tree | 517ed3b6cd2d4526f06a400fa5af43e14edcde64 | |
| parent | e6849a5722dc248a1fe0519c97094000ded3849c (diff) | |
| download | iproute2-24b058a2a4f5248becc3c148637a3644d11a65a9.tar.gz | |
color: Fix another ip segfault when using --color switch
Commit 959f1428 ("color: add new COLOR_NONE and disable_color function")
introducing color enum COLOR_NONE, which is not only duplicite of
COLOR_CLEAR, but also caused segfault, when running ip with --color
switch, as 'attr + 8' in color_fprintf() access array item out of
bounds. Thus removing it and restoring "magic" offset + 7.
Reproduce with:
$ ip -c a
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
| -rw-r--r-- | include/color.h | 1 | ||||
| -rw-r--r-- | lib/color.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/color.h b/include/color.h index 1cd6f7d2..c183ef79 100644 --- a/include/color.h +++ b/include/color.h @@ -2,7 +2,6 @@ #define __COLOR_H__ 1 enum color_attr { - COLOR_NONE, COLOR_IFNAME, COLOR_MAC, COLOR_INET, diff --git a/lib/color.c b/lib/color.c index 79d5e289..05afcb21 100644 --- a/lib/color.c +++ b/lib/color.c @@ -104,13 +104,13 @@ int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...) va_start(args, fmt); - if (!color_is_enabled || attr == COLOR_NONE) { + if (!color_is_enabled || attr == COLOR_CLEAR) { ret = vfprintf(fp, fmt, args); goto end; } ret += fprintf(fp, "%s", - color_codes[attr_colors[is_dark_bg ? attr + 8 : attr]]); + color_codes[attr_colors[is_dark_bg ? attr + 7 : attr]]); ret += vfprintf(fp, fmt, args); ret += fprintf(fp, "%s", color_codes[C_CLEAR]); |