From 8bc80f8b24cb6f03ad209ce546ae594904c8b353 Mon Sep 17 00:00:00 2001
From: Philip Gladstone <philipjsg@users.sourceforge.net>
Date: Sat, 27 Sep 2003 01:23:40 +0000
Subject: [PATCH] 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
---
ffserver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index d665f4ef505..9587d7bbddd 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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);
--
GitLab