[Pkg-mailman-hackers] Pkg-mailman commit - rev 222 - in trunk/debian: . patches

[Lionel Elie Mamane]

Author: lmamane-guest
Date: 2005-11-13 16:47:09 +0000 (Sun, 13 Nov 2005)
New Revision: 222

Added:
   trunk/debian/patches/71_date_overflows.dpatch
Modified:
   trunk/debian/changelog
Log:
Fix bug #326024
mailman: Unhandled exception in date handling causes mails to fail to be processed correctly


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-13 16:16:15 UTC (rev 221)
+++ trunk/debian/changelog	2005-11-13 16:47:09 UTC (rev 222)
@@ -4,8 +4,9 @@
     Python 2.4 compatibility patch in bounce handling.
   * Don't fall apart if the filename of an attachment is an invalid UTF-8
     string (closes: #327732)
+  * Don't die on overflow in date handling (closes: #326024)
 
- -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 13 Nov 2005 15:41:15 +0100
+ -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 13 Nov 2005 17:46:18 +0100
 
 mailman (2.1.5-9) unstable; urgency=medium
 

Added: trunk/debian/patches/71_date_overflows.dpatch
===================================================================
--- trunk/debian/patches/71_date_overflows.dpatch	2005-11-13 16:16:15 UTC (rev 221)
+++ trunk/debian/patches/71_date_overflows.dpatch	2005-11-13 16:47:09 UTC (rev 222)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 71_date_overflows.dpatch by  <lionel at mamane.lu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: React sensibly on integer overflow in date handling
+
+ at DPATCH@
+diff -urNad mailman-2.1.5~/Mailman/Handlers/Scrubber.py mailman-2.1.5/Mailman/Handlers/Scrubber.py
+--- mailman-2.1.5~/Mailman/Handlers/Scrubber.py	2005-11-13 17:14:04.000000000 +0100
++++ mailman-2.1.5/Mailman/Handlers/Scrubber.py	2005-11-13 17:44:31.308551771 +0100
+@@ -113,7 +113,7 @@
+ def safe_strftime(fmt, floatsecs):
+     try:
+         return time.strftime(fmt, floatsecs)
+-    except (TypeError, ValueError):
++    except (OverflowError, TypeError, ValueError):
+         return None
+ 
+ 
+@@ -142,7 +142,7 @@
+                      }.get(parts[3], 0)
+             day = int(parts[4])
+             year = int(parts[6])
+-        except (IndexError, ValueError):
++        except (OverflowError, IndexError, ValueError):
+             # Best we can do I think
+             month = day = year = 0
+         datedir = '%04d%02d%02d' % (year, month, day)
+diff -urNad mailman-2.1.5~/Mailman/Queue/ArchRunner.py mailman-2.1.5/Mailman/Queue/ArchRunner.py
+--- mailman-2.1.5~/Mailman/Queue/ArchRunner.py	2003-12-01 02:50:40.000000000 +0100
++++ mailman-2.1.5/Mailman/Queue/ArchRunner.py	2005-11-13 17:43:38.642854438 +0100
+@@ -49,7 +49,7 @@
+                 elif abs(now - mktime_tz(tup)) > \
+                          mm_cfg.ARCHIVER_ALLOWABLE_SANE_DATE_SKEW:
+                     clobber = 1
+-            except ValueError:
++            except (OverflowError, ValueError):
+                 # The likely cause of this is that the year in the Date: field
+                 # is horribly incorrect, e.g. (from SF bug # 571634):
+                 # Date: Tue, 18 Jun 0102 05:12:09 +0500


Property changes on: trunk/debian/patches/71_date_overflows.dpatch
___________________________________________________________________
Name: svn:executable
   + *