[FFmpeg-cvslog] ffserver: fix missing frees at connection setup

Reynaldo H. Verdejo Pinochet git at videolan.org
Sat Apr 26 00:55:25 CEST 2014


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <r.verdejo at sisa.samsung.com> | Fri Apr 25 19:38:24 2014 -0300| [7228bdeebd2835172b4c3697e1e681399531f3e6] | committer: Reynaldo H. Verdejo Pinochet

ffserver: fix missing frees at connection setup

Should fix FFmpeg Coverity Scan issue #732266 and some of #732265

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo at sisa.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7228bdeebd2835172b4c3697e1e681399531f3e6
---

 ffserver.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index cc736cb..b9825a1 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -648,18 +648,24 @@ static int http_server(void)
 
     if (my_http_addr.sin_port) {
         server_fd = socket_open_listen(&my_http_addr);
-        if (server_fd < 0)
+        if (server_fd < 0) {
+            av_free(poll_table);
             return -1;
+        }
     }
 
     if (my_rtsp_addr.sin_port) {
         rtsp_server_fd = socket_open_listen(&my_rtsp_addr);
-        if (rtsp_server_fd < 0)
+        if (rtsp_server_fd < 0) {
+            av_free(poll_table);
+            closesocket(server_fd);
             return -1;
+        }
     }
 
     if (!rtsp_server_fd && !server_fd) {
         http_log("HTTP and RTSP disabled.\n");
+        av_free(poll_table);
         return -1;
     }
 



More information about the ffmpeg-cvslog mailing list