diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:25:31 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2006-06-14 16:25:31 +0000 |
commit | 18e97b419daa5793c57a596eed732ef8b2724142 (patch) | |
tree | b8e496d8c89facb0789d723771fd182fa46f726e /contrib/sendmail/src/mci.c | |
parent | 9263e5eeaacae1b6448efe5929386998cbdf4b48 (diff) | |
download | FreeBSD-src-18e97b419daa5793c57a596eed732ef8b2724142.zip FreeBSD-src-18e97b419daa5793c57a596eed732ef8b2724142.tar.gz |
Resolve conflicts from sendmail 8.13.7 import
Diffstat (limited to 'contrib/sendmail/src/mci.c')
-rw-r--r-- | contrib/sendmail/src/mci.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index dd07449..1726379 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -14,7 +14,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07/12 22:27:44 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.217 2006/04/18 01:27:36 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -923,9 +923,17 @@ mci_read_persistent(fp, mci) char buf[MAXLINE]; if (fp == NULL) + { syserr("mci_read_persistent: NULL fp"); + /* NOTREACHED */ + return -1; + } if (mci == NULL) + { syserr("mci_read_persistent: NULL mci"); + /* NOTREACHED */ + return -1; + } if (tTd(56, 93)) { sm_dprintf("mci_read_persistent: fp=%lx, mci=", |