@@ -2,7 +2,6 @@
#define __COLOR_H__ 1
enum color_attr {
- COLOR_NONE,
COLOR_IFNAME,
COLOR_MAC,
COLOR_INET,
@@ -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]);
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> --- include/color.h | 1 - lib/color.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)