From patchwork Sun Oct 11 19:03:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22851 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2F31D44A327 for ; Sun, 11 Oct 2020 22:03:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09B3568BB05; Sun, 11 Oct 2020 22:03:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82BBA68BAF0 for ; Sun, 11 Oct 2020 22:03:50 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id 188so15835987qkk.12 for ; Sun, 11 Oct 2020 12:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6+UD5gjO1hPkzvzEI8mwR7mKd4C0VkYYsC3xc99gsr8=; b=XelwxaMScUDESBWhNT3R+ZTN9qpKqk76ubJwZS2Hz34+qAbfvYB0KqbUdTaEtCtcii H7vrvYWeJKXpWOTAAAQ3LGaynOus79tPvl34MeZdXra7xR9ZTqh5YJ3lsiFr7cCw8SrG L4Xjj5pYsoYkeTofYDJ0/Kqw+lbBabaUc+YqVvVP6iA4ryNPpmkHSnZ0n2TzTN5RFWXF DZp3Cr/XKDhGnp3cIG7Pa07yUvvwSwok/WRafy7lYll6mA0kec8feusYT/zee0SSz1S3 EV5rtVp5CsEG2G5Wco3ttDMGjNopW43ulafH7Iet6j1nls85T09oadJj9Lbkgt0jTCFL WtRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6+UD5gjO1hPkzvzEI8mwR7mKd4C0VkYYsC3xc99gsr8=; b=AM1hiVoo7LYXrPecykoUTkHC5B8jGQZjDU8YinVL6zk14/W/yKOOY9RvX6Tqc0DjCJ C0hd6nEXkqK2L7epsL62k8JvtbptFk6ZgClq6AbnMdpgU6Alqm9NepAi0wW5g84urSXp pCwTdahrMUxjhUaMDq/2JletEeaPbcZe+RjzLKDbxL3SdrkXbvSkr50JH6m8XNd3BD7t NfsxLzEVYmmM0Yu5oeWxfazik42xklpmcNBqrpEUoyzMEubv1ET++kc+4Gkn5CBSsYza fnq0QeixjE0d94QtROcYG3JjVjBw5gTNiPKehrxAa6Qvl1faEbOnktbDlK52+A291rM6 Zjfw== X-Gm-Message-State: AOAM531xLyWa3IwUrjWJLy/6K46YbQJfoPIri9eTVZVFH3RZxutvaPR1 g096Zu7ZLKwGzEU9IIKpqLuoyI9UO2Y= X-Google-Smtp-Source: ABdhPJwr20j7AetoogUiO1HD9D6OeufQtIOkeRfb37/5eU6kF4fM2d9vT2rlFJbtIQu9/z3gVDD5nw== X-Received: by 2002:ae9:f10b:: with SMTP id k11mr6676184qkg.209.1602443029102; Sun, 11 Oct 2020 12:03:49 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id b12sm10702930qtj.12.2020.10.11.12.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:03:48 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Oct 2020 15:03:28 -0400 Message-Id: <20201011190330.39991-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/rtspdec: set dangling pointers to NULL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Otherwise a double free will occur in case rtsp_read_close() is called on error. Signed-off-by: Andriy Gelman --- libavformat/rtspdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index ef084a8b2b..b519b6f1a2 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -691,7 +691,8 @@ static int rtsp_listen(AVFormatContext *s) } else if (methodcode == SETUP) ret = rtsp_read_setup(s, host, uri); if (ret) { - ffurl_close(rt->rtsp_hd); + ffurl_closep(&rt->rtsp_hd); + rt->rtsp_hd_out = NULL; return AVERROR_INVALIDDATA; } } From patchwork Sun Oct 11 19:03:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22852 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 12C5C44A47E for ; Sun, 11 Oct 2020 22:04:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F07B568AF73; Sun, 11 Oct 2020 22:04:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 393376800F1 for ; Sun, 11 Oct 2020 22:04:11 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id c2so15858583qkf.10 for ; Sun, 11 Oct 2020 12:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yq7EtJz7vPER6WkyUObxEsYnbrxHExt2R1qPfPJvCa8=; b=GlgP1WKbWlS0N30brOML77CrttbBRZdunjjFaB1/UaYvM0uvE7oewup99cMuS4rTvK mjynZc+MUWe/g0LDKByEbbNVJMWN31WwlFfe+fT3JkTCBby5I4kxVpBc1rE+7iP+o3yX Kl+NfOjuZQ/zvjdQsNnDqDPl0z0TwOG/xrga6gb7ZlYCPcZNbldEINmmTR1xpYAEwY6T 0FOK5Bm74ewYJWhHOs4ozYC3cUPCzTKj4ubC8dBCCxmrMa+B6hFk49vcStEIF0x7Oyvv IiihFjYnh+2MQy45I7MnwiuX0IaIuNhKbQv+9ndSClkdmfWMT/ifZK7idNOwm7desF8A cgNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yq7EtJz7vPER6WkyUObxEsYnbrxHExt2R1qPfPJvCa8=; b=NwAJW3pPVsbF24c/6ZhVyBwEAtpPK1aOSvsmOYAjz1Dc1qKoKmvbieJ0oZ23MBiqUx LByRRyAXydSMUkPdW3DSVGugnG+dmzJguq9N2GbAiaYXmf09CZrMTsFA7gsRctz+mFwD LLnuJbnC3I3Io/pQYPO2R/nnXdiBKQWcgD4wvM6pqV/LXy8IxLwzovNQElf6DM1xXnYk uBgqAaS8vgX8LCRRKFDgt0eEyat0CkogGLR+iW9V/rh0BPDhhtOCUsmSwiJhKh2Jres+ PuZ/Jo6nRdDUS5QQjsKD+1XDUjsNA5WOeV/S+A8PbMknwTbIY5ymW5fJOMjSjYRZgbkS HRLg== X-Gm-Message-State: AOAM533N8vPdTFVA+q9I6me6wCD7foM2/4ByJ5nxhDPUgzGHSf/J42+x OjiNfyVMFMtjliSIsxaYTsdJRFNk2Pk= X-Google-Smtp-Source: ABdhPJxZkFLUGBg3CDWxObRko3Vv3JJiar/zFDOps32r6H6JIclk4zYEa5Nd+o17lhN/9ONBpnArDA== X-Received: by 2002:a05:620a:848:: with SMTP id u8mr6652129qku.156.1602443049940; Sun, 11 Oct 2020 12:04:09 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id b12sm10702930qtj.12.2020.10.11.12.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:04:09 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Oct 2020 15:03:29 -0400 Message-Id: <20201011190330.39991-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201011190330.39991-1-andriy.gelman@gmail.com> References: <20201011190330.39991-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/rtspdec: fix mem leaks on init fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Fixes #6334 Signed-off-by: Andriy Gelman --- libavformat/rtspdec.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index b519b6f1a2..623f478585 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -720,7 +720,7 @@ static int rtsp_read_header(AVFormatContext *s) if (rt->rtsp_flags & RTSP_FLAG_LISTEN) { ret = rtsp_listen(s); if (ret) - return ret; + goto fail; } else { ret = ff_rtsp_connect(s); if (ret) @@ -728,22 +728,25 @@ static int rtsp_read_header(AVFormatContext *s) rt->real_setup_cache = !s->nb_streams ? NULL : av_mallocz_array(s->nb_streams, 2 * sizeof(*rt->real_setup_cache)); - if (!rt->real_setup_cache && s->nb_streams) - return AVERROR(ENOMEM); + if (!rt->real_setup_cache && s->nb_streams) { + ret = AVERROR(ENOMEM); + goto fail; + } rt->real_setup = rt->real_setup_cache + s->nb_streams; if (rt->initial_pause) { /* do not start immediately */ } else { if ((ret = rtsp_read_play(s)) < 0) { - ff_rtsp_close_streams(s); - ff_rtsp_close_connections(s); - return ret; + goto fail; } } } - return 0; + +fail: + rtsp_read_close(s); + return ret; } int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, From patchwork Sun Oct 11 19:03:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22853 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D0C9044A47E for ; Sun, 11 Oct 2020 22:04:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5D4868BAFD; Sun, 11 Oct 2020 22:04:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAB1568BB09 for ; Sun, 11 Oct 2020 22:04:14 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id c13so1138483qtx.6 for ; Sun, 11 Oct 2020 12:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z1npKE14+1/h9dLQe5nMsuPPmADeNGUaODugNpf1mDE=; b=CljRvUKEexLqhpjBlqlNaXwXzZCMQMXRicy2gO4qSr8SL0grpNc2/ItaxpwYph63c1 Cya9SquxVybJ5PRm25FFy4hNaxwBU/ejIpbIl+Z3q7E83PmomkE3yJW7fp8vAPQeSJ1c V50rDqo0g0/Qt1Ls+IMtuWHh4zHz9Rc1AVxPm1H4jp6cd0tJH5Uur/0ocFYqdJziX+L2 E+G3mO81JmidnxT6IKWTdD6Z/SSJzhTTBoZ6DIcM5bEw4qAEufdv7WfL6baOfk1728Wq KHZk1X3MNvSYTRNTm2hZYcUZy3JUiepfCTQPCuKMa96KPAIVsMrv7kDRkUumfkedp7g+ I6yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z1npKE14+1/h9dLQe5nMsuPPmADeNGUaODugNpf1mDE=; b=clez8X6s8BcBpmCfdKuzbJO7ZuaddW7a8MZL3YMJC8/IdGD7v0t+EVrSvwpxI8ufZW gID8m8WPHdzaUO2E+N2MJKkc05AY68I3c6hLK/WOiVtIQaM/I8SD2Nmi8D/0wQTBPVkh 3+YYd0tAva6i0ktVV4V9YpwT1Pp34RZJHZIGKlE1G2HFsLDmys080TNmDYcEC/N1qiRw 7Nb9V2jLGaiplkVHKZVv0O5/WGXGrMET2rpNZpOnXdquUMp6pgs66hhPqRXg3JiA4wK0 5zz30vUzTiTggdnswEUIsn/PzdYn4jCJC5x2Eyb0ZXzdf29zA/LrbiGZryNAte3Ec8IY hWjA== X-Gm-Message-State: AOAM530qFBpkX8ghnPKoTCu1eoJhnyTeldsUt7/5aQ3DmggxDmQnp6WM ISY7W8pkXD+r3JUP61ITOdb8KUuu7ys= X-Google-Smtp-Source: ABdhPJx4WaCSRWZ3pzqBsZPDWMw75OEGY2TZF0+XlPxsHKAx15dZvBtm4uDQyFpXTStMR8lmo0yY0A== X-Received: by 2002:aed:3fa2:: with SMTP id s31mr6916613qth.256.1602443053393; Sun, 11 Oct 2020 12:04:13 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id b12sm10702930qtj.12.2020.10.11.12.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 12:04:13 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Oct 2020 15:03:30 -0400 Message-Id: <20201011190330.39991-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201011190330.39991-1-andriy.gelman@gmail.com> References: <20201011190330.39991-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/rtspdec: cosmetics X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Make error check style consistent with rest of function. Signed-off-by: Andriy Gelman --- libavformat/rtspdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 623f478585..6da408c95b 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -737,9 +737,9 @@ static int rtsp_read_header(AVFormatContext *s) if (rt->initial_pause) { /* do not start immediately */ } else { - if ((ret = rtsp_read_play(s)) < 0) { + ret = rtsp_read_play(s); + if (ret < 0) goto fail; - } } } return 0;