SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

time-util: move buffer size check after handling of UNIX timestamp style

Browse Source
This commit is contained in:
Lennart Poettering
2023-01-20 17:43:35 +01:00
parent 4361678c4b
commit 3703e5d019
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/time-util.c
+11 -10
View File
@@ -317,16 +317,6 @@ char *format_timestamp_style(
assert(style >= 0);
assert(style < _TIMESTAMP_STYLE_MAX);
utc = IN_SET(style, TIMESTAMP_UTC, TIMESTAMP_US_UTC);
us = IN_SET(style, TIMESTAMP_US, TIMESTAMP_US_UTC);
if (l < (size_t) (3 + /* week day */
1 + 10 + /* space and date */
1 + 8 + /* space and time */
(us ? 1 + 6 : 0) + /* "." and microsecond part */
1 + 1 + /* space and shortest possible zone */
1))
return NULL; /* Not enough space even for the shortest form. */
if (!timestamp_is_set(t))
return NULL; /* Timestamp is unset */
@@ -338,6 +328,17 @@ char *format_timestamp_style(
return buf;
}
utc = IN_SET(style, TIMESTAMP_UTC, TIMESTAMP_US_UTC);
us = IN_SET(style, TIMESTAMP_US, TIMESTAMP_US_UTC);
if (l < (size_t) (3 + /* week day */
1 + 10 + /* space and date */
1 + 8 + /* space and time */
(us ? 1 + 6 : 0) + /* "." and microsecond part */
1 + 1 + /* space and shortest possible zone */
1))
return NULL; /* Not enough space even for the shortest form. */
/* Let's not format times with years > 9999 */
if (t > USEC_TIMESTAMP_FORMATTABLE_MAX) {
static const char* const xxx[_TIMESTAMP_STYLE_MAX] = {