merge 45152 don't leak descriptors in http.c

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@46117 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 22 insertions, 17 deletions

diff --git a/main/http.c b/main/http.c
index 0c0a6d974..a60a27318 100644
--- a/main/http.c
+++ b/main/http.c
@@ -494,6 +494,8 @@ static void *http_root(void *data)
 	pthread_attr_t attr;
 	
 	for (;;) {
+		int flags;
+
 		ast_wait_for_input(httpfd, -1);
 		sinlen = sizeof(sin);
 		fd = accept(httpfd, (struct sockaddr *)&sin, &sinlen);
@@ -503,25 +505,28 @@ static void *http_root(void *data)
 			continue;
 		}
 		ser = ast_calloc(1, sizeof(*ser));
-		if (ser) {
-			int flags = fcntl(fd, F_GETFL);
-			fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
-			ser->fd = fd;
-			memcpy(&ser->requestor, &sin, sizeof(ser->requestor));
-			if ((ser->f = fdopen(ser->fd, "w+"))) {
-				pthread_attr_init(&attr);
-				pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-				
-				if (ast_pthread_create_background(&launched, &attr, ast_httpd_helper_thread, ser)) {
-					ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
-					fclose(ser->f);
-					free(ser);
-				}
-			} else {
-				ast_log(LOG_WARNING, "fdopen failed!\n");
-				close(ser->fd);
+		if (!ser) {
+			ast_log(LOG_WARNING, "No memory for new session: %s\n", strerror(errno));
+			close(fd);
+			continue;
+		}
+		flags = fcntl(fd, F_GETFL);
+		fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
+		ser->fd = fd;
+		memcpy(&ser->requestor, &sin, sizeof(ser->requestor));
+		if ((ser->f = fdopen(ser->fd, "w+"))) {
+			pthread_attr_init(&attr);
+			pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+			
+			if (ast_pthread_create_background(&launched, &attr, ast_httpd_helper_thread, ser)) {
+				ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
+				fclose(ser->f);
 				free(ser);
 			}
+		} else {
+			ast_log(LOG_WARNING, "fdopen failed!\n");
+			close(ser->fd);
+			free(ser);
 		}
 	}
 	return NULL;