From f97e5336b4ad99795321448b852266f20ad0135f Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 18 May 2018 19:09:25 +0300 Subject: [PATCH] torrent 1.2.4: Fix a bug in handling overflow with dates > 2038 year --- torrent | 16 ++++++++++++---- torrent-ANNOUNCE | 3 +++ torrent-ChangeLog | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/torrent b/torrent index ebc3ee2..67588e5 100755 --- a/torrent +++ b/torrent @@ -37,10 +37,11 @@ The filesystem is, naturally, read-only. __version__ = "1.2.4" __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2010-2016 PhiloSoft Design" +__copyright__ = "Copyright (C) 2010-2018 PhiloSoft Design" __license__ = "GPL" +from datetime import datetime from os.path import dirname, getmtime import sys from time import localtime, asctime @@ -299,12 +300,19 @@ def decode_torrent(): def decode_datetime_asc(dt): - return asctime(localtime(float(dt))) + try: + return asctime(localtime(float(dt))) + except ValueError: + return datetime.max.ctime() def decode_datetime(dt): - Y, m, d, H, M = localtime(float(dt))[0:5] - return "%02d-%02d-%d %02d:%02d" % (m, d, Y, H, M) + try: + Y, m, d, H, M = localtime(float(dt))[0:5] + except ValueError: + return datetime.max.ctime() + else: + return "%02d-%02d-%d %02d:%02d" % (m, d, Y, H, M) def decode_announce_list(announce): diff --git a/torrent-ANNOUNCE b/torrent-ANNOUNCE index b89de35..1c8f970 100644 --- a/torrent-ANNOUNCE +++ b/torrent-ANNOUNCE @@ -7,6 +7,9 @@ Midnight Commander. WHAT'S NEW +Version 1.2.4 (2018-05-18) + Fix a bug in handling overflow with dates > 2038 year. + Version 1.2.3 (2015-07-08) Set directories/files date/time to the content of ".META/creation date" file if it exists or to the last modification time of the torrent file itself. diff --git a/torrent-ChangeLog b/torrent-ChangeLog index bdad9da..43a7760 100644 --- a/torrent-ChangeLog +++ b/torrent-ChangeLog @@ -1,3 +1,7 @@ +Version 1.2.4 (2018-05-18) + + Fix a bug in handling overflow with dates > 2038 year. + Version 1.2.3 (2015-07-08) Set directories/files date/time to the content of ".META/creation date" file -- 2.39.5