diff options
| author |   kili <kili@openbsd.org> | 2019-06-27 13:10:48 +0000 |
|---|---|---|
| committer | kili <kili@openbsd.org> | 2019-06-27 13:10:48 +0000 |
| commit | df8e24af0fa6e6e49c5622f9ccad0d05e7d48685 (patch) | |
| tree | aaaaf5b07e474aeecadca67e562151f0d03ca0fa | |
| parent | Improve "man -h" output. (diff) | |
| download | wireguard-openbsd-df8e24af0fa6e6e49c5622f9ccad0d05e7d48685.tar.xz wireguard-openbsd-df8e24af0fa6e6e49c5622f9ccad0d05e7d48685.zip | |
Move the check wether line is NULL above further accesses of it.
ok gilles@
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 982c28c2398..5c5836d0ae2 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.392 2019/06/26 08:46:08 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.393 2019/06/27 13:10:48 kili Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1089,6 +1089,10 @@ smtp_io(struct io *io, int evt, void *arg) return; } + /* No complete line received */ + if (line == NULL) + return; + if (strchr(line, '\r')) { s->flags |= SF_BADINPUT; smtp_reply(s, "500 %s: <CR> is only allowed before <LF>", @@ -1098,10 +1102,6 @@ smtp_io(struct io *io, int evt, void *arg) return; } - /* No complete line received */ - if (line == NULL) - return; - /* Message body */ eom = 0; if (s->state == STATE_BODY) { |