This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH] ar: Assume epoch if ar_date is bogus.
- From: Mark Wielaard <mark at klomp dot org>
- To: elfutils-devel at sourceware dot org
- Cc: Mark Wielaard <mark at klomp dot org>
- Date: Sun, 14 Oct 2018 17:31:26 +0200
- Subject: [PATCH] ar: Assume epoch if ar_date is bogus.
If the ar header contains a bogus ar_date then in verbose mode we would
get a NULL pointer from localtime. Just assume the entry was created
during the epoch.
https://sourceware.org/bugzilla/show_bug.cgi?id=23754
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
src/ChangeLog | 4 ++++
src/ar.c | 10 ++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index b260044..8fb3deb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2018-10-14 Mark Wielaard <mark@klomp.org>
+ * ar.c (do_oper_extract): Assume epoch if ar_date is bogus.
+
+2018-10-14 Mark Wielaard <mark@klomp.org>
+
* findtextrel.c (process_file): Check that sh_entsize is not zero.
2018-10-02 Andreas Schwab <schwab@suse.de>
diff --git a/src/ar.c b/src/ar.c
index 6f98f75..d70f1f4 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -539,8 +539,14 @@ do_oper_extract (int oper, const char *arfname, char **argv, int argc,
else if (oper == oper_list)
{
char datestr[100];
- strftime (datestr, sizeof (datestr), "%b %e %H:%M %Y",
- localtime (&arhdr->ar_date));
+ struct tm *tp = localtime (&arhdr->ar_date);
+ if (tp == NULL)
+ {
+ time_t time = 0;
+ tp = localtime (&time);
+ }
+
+ strftime (datestr, sizeof (datestr), "%b %e %H:%M %Y", tp);
printf ("%c%c%c%c%c%c%c%c%c %u/%u %6ju %s %s\n",
(arhdr->ar_mode & S_IRUSR) ? 'r' : '-',
--
1.8.3.1