bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in rfcmsg when the Cc: header is empty

Browse Source
This commit is contained in:
Michiel Broek 2003-07-12 20:34:04 +00:00
parent eca95541e5
commit c93e32331e
3 changed files with 97 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -26,6 +26,8 @@ v0.37.4 10-May-2003
5 years to find them! If you want to check, call 5:5/0
Fixed compiler warning in network code.
printable function now escapes all non-printable characters.
In rfcmsg function the Cc: header is now treated as any other
header to prevent a SIGSEGV when the headerline is empty.
mbcico:
The binkp transmitter does now escape the unsafe filename

2
lib/common.h
View File

@ -418,7 +418,7 @@ typedef struct _rfcmsg {
rfcmsg *parsrfc(FILE *);
void tidyrfc(rfcmsg *);
void dumpmsg(rfcmsg *,FILE *);
/*

49
lib/rfcmsg.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: RFC msg
*
*****************************************************************************
* Copyright (C) 1997-2002
* Copyright (C) 1997-2003
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@ -47,12 +47,14 @@
/*
* Parse RFC message, extract headers and do some sanity checks.
*/
rfcmsg *parsrfc(FILE *fp)
{
int linecont=FALSE,newcont,firstline;
rfcmsg *start=NULL, *cur=NULL;
char buffer[BUFSIZ];
char *p;
char buffer[BUFSIZ], *p;
while (bgets(buffer, BUFSIZ-1, fp) && strcmp(buffer,"\n")) {
newcont = (buffer[strlen(buffer)-1] != '\n');
@ -95,17 +97,6 @@ rfcmsg *parsrfc(FILE *fp)
Syslog('M', "This is a uucpfrom line");
cur->key=xstrcpy((char *)"X-UUCP-From");
cur->val=xstrcpy(buffer+4);
} else if ( !strncasecmp(buffer,"Cc:",3)) {
Syslog('M', "Cc: line");
if (strchr(buffer+3,'@')) {
cur->key = xstrcpy((char *)"Cc");
cur->val = xstrcpy(buffer+3);
} else {
Syslog('M', "FTN Cc: line: \"%s\"", buffer);
cur->key = xstrcpy((char *)"X-Body-Start");
cur->val = xstrcpy(buffer);
break;
}
} else if ((p=strchr(buffer,':')) && (p > buffer) && /* ':' isn't 1st chr */
isspace(*(p+1)) && /* space past ':' */
/* at least one non blank char */
@ -124,13 +115,13 @@ rfcmsg *parsrfc(FILE *fp)
cur->val = xstrcpy((char *)" ");
} else if ((p=strchr(buffer,':')) && (p > buffer)) {
/*
* Header line without information, don't add this one.
* Header line without information, don't add this one but log.
*/
Syslog('!', "Header line %s without key value", buffer);
Syslog('!', "Header line \"%s\" without key value", buffer);
cur->key = xstrcpy(buffer);
cur->val = xstrcpy((char *)" ");
} else if ((p=strchr(buffer,':')) && (p > buffer) && isspace(*(p+1))) { /* space past ':' */
Syslog('!', "Header line %s without key value (but with a Space)", buffer);
Syslog('!', "Header line \"%s\" without key value (but with a Space)", buffer);
cur->key = xstrcpy(buffer);
cur->val = xstrcpy((char *)" ");
} else {
@ -163,27 +154,3 @@ void tidyrfc(rfcmsg *msg)
return;
}
void dumpmsg(rfcmsg *msg, FILE *fp)
{
char *p;
p = hdr((char *)"X-Body-Start",msg);
for (; msg; msg=msg->next)
if (strcasecmp(msg->key, "X-Body-Start")) {
if (!strcasecmp(msg->key, "X-UUCP-From"))
fputs("From", fp);
else {
fputs(msg->key,fp);
fputs(":",fp);
}
fputs(msg->val,fp);
}
fputs("\n",fp);
if (p)
fputs(p,fp);
return;
}