From patchwork Mon Oct 12 20:36:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22874 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 838ED44AFE6 for ; Mon, 12 Oct 2020 23:36:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F88D68BB90; Mon, 12 Oct 2020 23:36:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1D9968B9BC for ; Mon, 12 Oct 2020 23:36:34 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id c23so14532530qtp.0 for ; Mon, 12 Oct 2020 13:36:34 -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=/dyA8fyhWFX0XP+c7/7xy35I+9iirg14rSoOFfJtiy8=; b=BkgCetEWMA8t9Fv4FHurONkHu8MeMmymPqbxuINQEjygW2vutOA9dCz9L/AAyg5d4V eXwsZnr6ON802pxms6FfL124KMbsUd7KuO0vy99KMerIv9iT0O0aBY8601dUqXoxbIw8 Dybm6v3RXXW/W8MsCe85Z1slNWpIq9wbCSxhC9ZNYdrOl30qTvdk3R5HRVvdntgSTl0R 5aj5Mc6nEZrj+SO1GnJrXuBOE7ron9yCaEoLU+hPXOUkpfcdA7Q7nUYIxj9BrQfEn1QV K7KiUE25E/TlQKukbLFMxtP/lv93dsdvE8tJJZfECDxnQDIIxF3kxv9e2wweGcHeydQX UjoQ== 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=/dyA8fyhWFX0XP+c7/7xy35I+9iirg14rSoOFfJtiy8=; b=lwlQ6VeUgauolUW/2E61tnMCZyeP1ck8cgWtcWqbmTwiAEakrZe9sqk0v3QUeo4ZOy VgOCLK8ah5Mpmxyfc9/GA/9imipTBhWwkmIph3OEv8ZJ65XXUR7dAw8pdHJdDQJ828RG AG7P/43hkWRzZUfIQMwmTnIhES/hmkCwzeOIh1uQR9eUND2zmWWXl8o6EgCU9Rwpu0TW HdDO5r3nDmwEBAjOqAiQgbXdQ7bqCtZJ6h4mUxZTc8HV7MyiebES2xteZlpo1yLBkiL0 vgUgitF5hg+OovvK+k5bR+dSJlPZkmkzGek3lcozh3lKK7ezdD8egClv2tACBhskZiSN Rw2Q== X-Gm-Message-State: AOAM5303lb/SZ6qggTqCCbf2v+tineyIV2gaZFL0ntOsm1dIRaSXwaZu gwdCnhtHw44HMfQCJqOq369NQ9dRK6k= X-Google-Smtp-Source: ABdhPJySvaU4vLaXPt2nhS7YyUbVBxQBGXBkCCjnlHAqVUrfegbmvPdXjmdua1na7vob3VdLUX9Q8w== X-Received: by 2002:aed:2982:: with SMTP id o2mr11499389qtd.73.1602534993292; Mon, 12 Oct 2020 13:36:33 -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 p38sm13521826qtb.20.2020.10.12.13.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 13:36:32 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Oct 2020 16:36:05 -0400 Message-Id: <20201012203609.41647-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012203609.41647-1-andriy.gelman@gmail.com> References: <20201012203609.41647-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/6] avformat/rtspdec: fix mem leaks in listen mode if init fails 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 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 1ff84cdd56..5a383b5a19 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -694,12 +694,13 @@ static int rtsp_listen(AVFormatContext *s) } else if (methodcode == SETUP) ret = rtsp_read_setup(s, host, uri); if (ret) { - ffurl_close(rt->rtsp_hd); ret = AVERROR_INVALIDDATA; goto fail; } } fail: + ff_rtsp_close_streams(s); + ff_rtsp_close_connections(s); ff_network_close(); return ret; }