github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3342 from datauwu/bsdcpio-fix-ub

Browse Source 
bsdcpio: fix UB signed overflow in time formatting
This commit is contained in:
Tim Kientzle authored and GitHub committed 2026-08-01 08:54:01 -07:00
2 parents 8c4acda5e7 0da2e229b1
commit ea476d962f
2 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpio/cpio.c
+4 -4
View File
@@ -1160,6 +1160,7 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry)
const char *uname, *gname;
FILE *out = stdout;
const char *fmt;
double age;
time_t mtime;
static time_t now;
struct tm *ltime;
@@ -1199,16 +1200,15 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry)
/* Format the time using 'ls -l' conventions. */
mtime = archive_entry_mtime(entry);
age = difftime(mtime, now);
#if defined(_WIN32) && !defined(__CYGWIN__)
/* Windows' strftime function does not support %e format. */
if (mtime - now > 365*86400/2
|| mtime - now < -365*86400/2)
if (age > 365.0 * 86400 / 2 || age < -365.0 * 86400 / 2)
fmt = cpio->day_first ? "%d %b %Y" : "%b %d %Y";
else
fmt = cpio->day_first ? "%d %b %H:%M" : "%b %d %H:%M";
#else
if (mtime - now > 365*86400/2
|| mtime - now < -365*86400/2)
if (age > 365.0 * 86400 / 2 || age < -365.0 * 86400 / 2)
fmt = cpio->day_first ? "%e %b %Y" : "%b %e %Y";
else
fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M";
tar/util.c
+4 -2
View File
@@ -667,6 +667,7 @@ list_item_verbose(struct bsdtar *bsdtar, FILE *out, struct archive_entry *entry)
size_t sw;
const char *p;
const char *fmt;
double age;
time_t tim;
static time_t now;
struct tm *ltime;
@@ -737,13 +738,14 @@ list_item_verbose(struct bsdtar *bsdtar, FILE *out, struct archive_entry *entry)
/* Format the time using 'ls -l' conventions. */
tim = archive_entry_mtime(entry);
#define HALF_YEAR (time_t)365 * 86400 / 2
age = difftime(tim, now);
#define HALF_YEAR (365.0 * 86400 / 2)
#if defined(_WIN32) && !defined(__CYGWIN__)
#define DAY_FMT "%d" /* Windows' strftime function does not support %e format. */
#else
#define DAY_FMT "%e" /* Day number without leading zeros */
#endif
if (tim < now - HALF_YEAR || tim > now + HALF_YEAR)
if (age < -HALF_YEAR || age > HALF_YEAR)
fmt = bsdtar->day_first ? DAY_FMT " %b %Y" : "%b " DAY_FMT " %Y";
else
fmt = bsdtar->day_first ? DAY_FMT " %b %H:%M" : "%b " DAY_FMT " %H:%M";