diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2011-08-26 20:55:09 +0000 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-08-26 20:55:09 +0000 |
commit | 717758409e24b42dba8fbf1ac77c6fdf524efc12 (patch) | |
tree | c594978a7f0744685b766dbd5a9c8cb60d301bed | |
parent | aa167adb90704e09726553a21bf3385991e958bf (diff) |
Fix segfault in BarMeterMode_draw() for small terminal widths
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Meter.c | 10 |
2 files changed, 10 insertions, 2 deletions
@@ -6,6 +6,8 @@ What's new in version 0.9.1 * Meters update in every screen (no longer halting while on Setup, etc.) * BUGFIX: Support larger numbers for process times. (thanks to Tristan Nakagawa for the report.) +* BUGFIX: Segfault in BarMeterMode_draw() for small terminal widths + (patch by Sebastian Pipping) What's new in version 0.9 @@ -264,13 +264,19 @@ static void BarMeterMode_draw(Meter* this, int x, int y, int w) { w--; x++; - char bar[w]; + + if (w < 1) { + attrset(CRT_colors[RESET_COLOR]); + return; + } + char bar[w + 1]; int blockSizes[10]; for (int i = 0; i < w; i++) bar[i] = ' '; - sprintf(bar + (w-strlen(buffer)), "%s", buffer); + const size_t barOffset = w - MIN(strlen(buffer), w); + snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer); // First draw in the bar[] buffer... double total = 0.0; |