diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-08-18 11:18:41 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-08-18 11:18:41 +0200 |
| commit | 108f2e90fac09808dfdda358b0b67ccdb8f23713 (patch) | |
| tree | f9a8accd4f2bdd2cf1b5dddedc3977ed8a989aa1 | |
| parent | 48aa968cea9239726957dd84186bba05768ece83 (diff) | |
| download | httpd-openbsd/5.7.tar.gz httpd-openbsd/5.7.zip | |
From OPENBSD_5_7 (5.7-stable):openbsd/5.7
MFC usr.sbin/httpd/server.c:1.62->1.63, req by florian@
We cannot log errors with server_close() before allocating
clt_log evbuffer.
server_close() calls server_log() which uses ctl_log.
Crash reported by Daniel Jakots <vigdis AT chown DOT me>, thanks!
OK benno
| -rw-r--r-- | server.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.60 2015/02/23 09:52:28 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.60.2.1 2015/04/30 22:18:41 sthen Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -851,6 +851,11 @@ server_accept(int fd, short event, void *arg) if ((clt = calloc(1, sizeof(*clt))) == NULL) goto err; + /* Pre-allocate log buffer */ + clt->clt_log = evbuffer_new(); + if (clt->clt_log == NULL) + goto err; + clt->clt_s = s; clt->clt_fd = -1; clt->clt_toread = TOREAD_UNLIMITED; @@ -898,13 +903,6 @@ server_accept(int fd, short event, void *arg) return; } - /* Pre-allocate log buffer */ - clt->clt_log = evbuffer_new(); - if (clt->clt_log == NULL) { - server_close(clt, "failed to allocate log buffer"); - return; - } - if (srv->srv_conf.flags & SRVFLAG_TLS) { event_again(&clt->clt_ev, clt->clt_s, EV_TIMEOUT|EV_READ, server_accept_tls, &clt->clt_tv_start, |