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; } }