Commit 8bc80f8b authored by Philip Gladstone's avatar Philip Gladstone

Minor bugfix to prevent segfault if a malloc fails. I have no idea what

will happen, but at least this crash is gone.

Originally committed as revision 2307 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 80de6a80
......@@ -534,7 +534,6 @@ static int http_server(void)
first_http_ctx = NULL;
nb_connections = 0;
first_http_ctx = NULL;
start_multicast();
......@@ -681,8 +680,6 @@ static void new_connection(int server_fd, int is_rtsp)
if (!c)
goto fail;
c->next = first_http_ctx;
first_http_ctx = c;
c->fd = fd;
c->poll_entry = NULL;
c->from_addr = from_addr;
......@@ -690,6 +687,9 @@ static void new_connection(int server_fd, int is_rtsp)
c->buffer = av_malloc(c->buffer_size);
if (!c->buffer)
goto fail;
c->next = first_http_ctx;
first_http_ctx = c;
nb_connections++;
start_wait_request(c, is_rtsp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment