From bb8184768d6b13bd32a3eb2224110f3e00573cbc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 15 Oct 2017 20:17:32 +0200 Subject: be more conservative about result from ctime_r --- src/plugins/rpm_extractor.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/rpm_extractor.c') diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c index d54e341..e1f2d62 100644 --- a/src/plugins/rpm_extractor.c +++ b/src/plugins/rpm_extractor.c @@ -352,8 +352,11 @@ EXTRACTOR_rpm_extract_method (struct EXTRACTOR_ExtractContext *ec) uint32_t *v = rpmtdNextUint32 (p); time_t tp = (time_t) *v; - ctime_r (&tp, tmp); - tmp[strlen (tmp) - 1] = '\0'; /* eat linefeed */ + if (NULL == ctime_r (&tp, tmp)) + break; + if ( (strlen (tmp) > 0) && + (isblank ((unsigned char) tmp[strlen(tmp)-1])) ) + tmp[strlen (tmp) - 1] = '\0'; /* eat linefeed */ pthread_mutex_lock (&parg.lock); if (0 != ec->proc (ec->cls, "rpm", -- cgit v1.2.3