Bug 171616

From the dspam and cyrus mailing list:

Alec H. Peterson wrote:

> Does this patch fix the problem?  Will it be accepted into Cyrus?

Just committed to CVS.

> On Aug 18, 2005, at 15:24, Scott Russell wrote:
>
>> gelle wrote:
>>
>>> We had the same thing.  It's a bug in cyrus (off by one) so when  they read
their own null from the buffer they complain the message  has a null.  We
patched it.  We also sent the patch into cyrus.
>>>
>>
>> Was the patch accepted? I'm not sure when the patch went to the  cyrus folks
but being on the list I don't recall seeing it go by.  I'm curious if this will
make it into future versions of cyrus.
>>
>>
>>> --- cyrus-imapd-2.2.12/imap/spool.c     2004-10-27  16:40:50.000000000 -0400
>>> +++ cyrus-imapd-2.2.12p10/imap/spool.c  2005-05-27  17:25:09.000000000 -0400
>>> @@ -451,9 +455,9 @@
>>>             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;
>>>         }
>>>
>>
>>
>> -- 
>> Scott Russell <lnxgeek.com>
>> IBM Linux Technology Center System Admin
>>
>> ----
>> Cyrus Home Page: http://asg.web.cmu.edu/cyrus
>> Cyrus Wiki/FAQ: http://cyruswiki.andrew.cmu.edu
>> List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html
>>
>> !DSPAM:4305019b26714647417383!
>>
>>
>>
>
> ----
> Cyrus Home Page: http://asg.web.cmu.edu/cyrus
> Cyrus Wiki/FAQ: http://cyruswiki.andrew.cmu.edu
> List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html
>


-- 
Kenneth Murchison
Systems Programmer
Carnegie Mellon University
----
Cyrus Home Page: http://asg.web.cmu.edu/cyrus
Cyrus Wiki/FAQ: http://cyruswiki.andrew.cmu.edu
List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html