merge 45152 don't leak descriptors in http.c

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46117 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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,8 +505,12 @@ static void *http_root(void *data)
 			continue;
 		}
 		ser = ast_calloc(1, sizeof(*ser));
-		if (ser) {
+		if (!ser) {
-			int flags = fcntl(fd, F_GETFL);
+			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));
@@ -523,7 +529,6 @@ static void *http_root(void *data)
 			free(ser);
 		}
 	}
-	}
 	return NULL;
 }