Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-10-05 16:01:13 +01:00
7 changed files with 101 additions and 97 deletions

View File

@ -3327,7 +3327,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers,
fte = format_table_get(key);
if (fte != NULL) {
value = fte->cb(ft);
if (fte->type == FORMAT_TABLE_TIME)
if (fte->type == FORMAT_TABLE_TIME && value != NULL)
t = ((struct timeval *)value)->tv_sec;
else
found = value;