[Pkg-Cyrus-imapd-Debian-devel] Bug#342314: cyrus22-imapd: long line bug in Cyrus

[Mark Nipper]

Package: cyrus22-imapd
Version: 2.2.12-1
Severity: important
Tags: patch

        Please include the patch below as seen on the DSPAM users
list recently (and supposedly already reported to the Cyrus folks, but
no new releases have been made upstream since then).

        And thanks for getting this into experimental finally.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (700, 'testing'), (600, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.13.4
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages cyrus22-imapd depends on:
ii  cyrus22-common                2.2.12-1   Cyrus mail system (common files)
ii  libc6                         2.3.5-8    GNU C Library: Shared libraries an
ii  libdb4.2                      4.2.52-18  Berkeley v4.2 Database Libraries [
ii  libsasl2                      2.1.19-1.7 Authentication abstraction library
ii  libssl0.9.8                   0.9.8a-3   SSL shared libraries
ii  libwrap0                      7.6.dbs-8  Wietse Venema's TCP wrappers libra

cyrus22-imapd recommends no packages.

-- no debconf information

diff -urN cyrus22-imapd-2.2.12.orig/imap/spool.c cyrus22-imapd-2.2.12/imap/spool.c
--- cyrus22-imapd-2.2.12.orig/imap/spool.c	2005-12-05 11:07:09.000000000 -0600
+++ cyrus22-imapd-2.2.12/imap/spool.c	2005-12-05 11:10:04.000000000 -0600
@@ -451,7 +451,7 @@
 	    p[1] = '\n';
 	    p[2] = '\0';
 	}
-	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-2)) {
+	else if (p[0] != '\n' && (strlen(buf) < sizeof(buf)-3)) {
 	    /* line contained a \0 not at the end */
 	    r = IMAP_MESSAGE_CONTAINSNULL;
 	    continue;