diff options
| author |   gilles <gilles@poolp.org> | 2016-10-12 09:12:42 +0200 |
|---|---|---|
| committer | gilles <gilles@poolp.org> | 2016-10-12 09:12:42 +0200 |
| commit | d5c50b04a521df881dc4eb53a4047b63857309e4 (patch) | |
| tree | 91748a73f92ea111a5aa4be9c7b38d6b1c6f02d1 /smtpd | |
| parent | fix session logic bug leading to possible crash (diff) | |
| download | OpenSMTPD-d5c50b04a521df881dc4eb53a4047b63857309e4.tar.xz OpenSMTPD-d5c50b04a521df881dc4eb53a4047b63857309e4.zip | |
smtp state machine has a logic bug that can cause a session to hang
Diffstat (limited to 'smtpd')
| -rw-r--r-- | smtpd/rfc2822.c | 5 | ||||
| -rw-r--r-- | smtpd/smtp_session.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/smtpd/rfc2822.c b/smtpd/rfc2822.c index 38c15428..27794751 100644 --- a/smtpd/rfc2822.c +++ b/smtpd/rfc2822.c @@ -50,6 +50,9 @@ header_callback(struct rfc2822_parser *rp) struct rfc2822_hdr_cb *hdr_cb; struct rfc2822_hdr_miss_cb *hdr_miss_cb; + if (!rp->in_hdr) + goto end; + TAILQ_FOREACH(hdr_cb, &rp->hdr_cb, next) if (strcasecmp(hdr_cb->name, rp->header.name) == 0) { hdr_cb->func(&rp->header, hdr_cb->arg); @@ -148,6 +151,8 @@ rfc2822_parser_flush(struct rfc2822_parser *rp) return; header_callback(rp); + + missing_headers_callback(rp); } void diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c index bd42f50f..728e3efb 100644 --- a/smtpd/smtp_session.c +++ b/smtpd/smtp_session.c @@ -1346,6 +1346,8 @@ smtp_io(struct io *io, int evt) s->tx->dataeom = 1; if (iobuf_queued(&s->tx->obuf) == 0) smtp_data_io_done(s); + else + io_reload(&s->tx->oev); return; } |