diff options
| author | Yuriy M. Kaminskiy | 2016-02-27 17:27:29 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-03-07 15:11:06 +0100 |
| commit | 06fa5817489adb9728f8a29d4cb7602fb48b8bdb (patch) | |
| tree | b3a6f1d0db6b1a6d0e340c1297f243c07c1de618 /misc-utils/cal.c | |
| parent | lsns.c: fix error return (diff) | |
| download | kernel-qcow2-util-linux-06fa5817489adb9728f8a29d4cb7602fb48b8bdb.tar.gz kernel-qcow2-util-linux-06fa5817489adb9728f8a29d4cb7602fb48b8bdb.tar.xz kernel-qcow2-util-linux-06fa5817489adb9728f8a29d4cb7602fb48b8bdb.zip | |
misc: safer (and uniform) handling of return value
When `rc` is `INT_MAX`, `rc + 1` result in signed integer overflow.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/cal.c')
| -rw-r--r-- | misc-utils/cal.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/misc-utils/cal.c b/misc-utils/cal.c index b7f38275c..c687c6c9d 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -514,10 +514,15 @@ static void headers_init(struct cal_control *ctl) size_t i, wd; char *cur_dh = day_headings; char tmp[FMT_ST_CHARS]; - size_t year_len; + int year_len; year_len = snprintf(tmp, sizeof(tmp), "%d", ctl->req.year); + if (year_len < 0 || (size_t)year_len >= sizeof(tmp)) { + /* XXX impossible error */ + return; + } + for (i = 0; i < DAYS_IN_WEEK; i++) { size_t space_left; wd = (i + ctl->weekstart) % DAYS_IN_WEEK; |