vmstat: Prevent out-of-bounds writes in new_header() and diskheader().
This does not happen with the default string (" -----timestamp-----"), but this string is translated (to unknown lengths).
This commit is contained in:
parent
0b55f0dc80
commit
0bfe708c4b
10
vmstat.c
10
vmstat.c
@ -256,7 +256,10 @@ static void new_header(void)
|
||||
(void) time( &the_time );
|
||||
tm_ptr = localtime( &the_time );
|
||||
if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) {
|
||||
timebuf[strlen(timestamp_header) - 1] = '\0';
|
||||
const size_t len = strlen(timestamp_header);
|
||||
if (len >= 1 && len - 1 < sizeof(timebuf)) {
|
||||
timebuf[len - 1] = '\0';
|
||||
}
|
||||
} else {
|
||||
timebuf[0] = '\0';
|
||||
}
|
||||
@ -566,7 +569,10 @@ static void diskheader(void)
|
||||
(void) time( &the_time );
|
||||
tm_ptr = localtime( &the_time );
|
||||
if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) {
|
||||
timebuf[strlen(timestamp_header) - 1] = '\0';
|
||||
const size_t len = strlen(timestamp_header);
|
||||
if (len >= 1 && len - 1 < sizeof(timebuf)) {
|
||||
timebuf[len - 1] = '\0';
|
||||
}
|
||||
} else {
|
||||
timebuf[0] = '\0';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user