From b60ef4ee096d471992aac806fb67485ee26d657f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 18 Aug 2005 12:19:16 +0000 Subject: r9389: handle errors reading from files in web server bug found by coverity (This used to be commit 1a3229777adf12f8148267af7b33689ebe880ed8) --- source4/web_server/web_server.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/web_server/web_server.c') diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index 80e479d8a7..4962185526 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -153,13 +153,14 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags) web->output.nsent = 0; nread = read(web->output.fd, buf, sizeof(buf)); - if (nread == 0) { - close(web->output.fd); - web->output.fd = -1; - } if (nread == -1 && errno == EINTR) { return; } + if (nread <= 0) { + close(web->output.fd); + web->output.fd = -1; + nread = 0; + } web->output.content = data_blob_talloc(web, buf, nread); } -- cgit