From patchwork Sat Sep 19 16:35:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22483 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 0ACD944A6BC for ; Sat, 19 Sep 2020 19:36:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD11668B666; Sat, 19 Sep 2020 19:36:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBA6B68B51A for ; Sat, 19 Sep 2020 19:36:39 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id w5so8578954wrp.8 for ; Sat, 19 Sep 2020 09:36:39 -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=nElWszA6PXYFuf7WkEtMI/KgCNF1YycIR7FfxBVNMuE=; b=sAcm/aW46Qjy/8wpuktdebgHBmA27rA4MOIJgvpPROWwGzYRtyQ284Wb5WBl/omE9P p1OzUPP4RI+R93JGmaT/b8bJmIglj+AQugBrURxgVrWduolQgOyKSc/BBjzhw0er8Vl2 wwUfQ+XBhLtbI6/iQh6t3AOuiPwBzw1xrBhEbM0VMkZqF2YkjaRfgwxfXTxfEou51pkU wfVoNwxuT6JD0eY8560FhragCz8R1CsaaMxhZGks1paVEG8XXVj7gq/IcABSLE230bPn kpolkeAXeVDjKBJPPVv+1QHHlrjFzcf/AU2k3pQLTcAL+gFZk+k6WNH+RjsEtZAiq4qa ZFZg== 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=nElWszA6PXYFuf7WkEtMI/KgCNF1YycIR7FfxBVNMuE=; b=j1vSkhRPbNj5FUSocXqsb8DvlUbdmU55U6bfiCAZFVx21lkNnmnqv2wxl1o+LSikSs mCNzbD6yRkCH7BW7IUsa1b0AzUYXgidPMdDet9BvtVEfMQyjM3eX1VrGXcg7k85gjMQn JVvZUyTxy+nQe/JmjXbMbrS0FBU7AjRFnuixTRRiOa2FcEBMNsmIzVLb3H2jYgCG791g NUla2Q1hzJUdMPVU3d5UvFp3re9Yhq9uQFmqFJlTAi9qVLeQwWUkq4kMpJTqcLsJCOBD Z7ttRzi51UyW0nSalp1QjtTQeFxoZEAZfZ7tTq/8ImLXBXAagtRFAGNmXBKWp3HdAG4b NA6A== X-Gm-Message-State: AOAM532a+4VwRIhC0AviJGdu8G50896D+bZ1ZVnAEJETln5AvBL0rFPo 1oBcLIAbRRPpyNwpaW4c8EYDiG+0S0s= X-Google-Smtp-Source: ABdhPJzIe1nLAxatNIdBNUhlcYubQ1FbJBIqzkp5Z+WUbRzDwbMGeUJSkYWepwio2+qGEgALxtE4SQ== X-Received: by 2002:adf:f6c8:: with SMTP id y8mr46714148wrp.217.1600533399052; Sat, 19 Sep 2020 09:36:39 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d5sm12451137wrb.28.2020.09.19.09.36.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2020 09:36:38 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Sep 2020 18:35:50 +0200 Message-Id: <20200919163610.1099233-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/21] avformat/dashdec: Avoid double free on error 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When using one of the AV_DICT_DONT_STRDUP_KEY/VAL flags, av_dict_set() already frees the key/value on error, so that freeing it again would lead to a double free. Signed-off-by: Andreas Rheinhardt --- libavformat/dashdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 1e9985f32c..4048323c7d 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1869,10 +1869,8 @@ static int save_avio_options(AVFormatContext *s) if (av_opt_get(s->pb, *opt, AV_OPT_SEARCH_CHILDREN, &buf) >= 0) { if (buf[0] != '\0') { ret = av_dict_set(&c->avio_opts, *opt, buf, AV_DICT_DONT_STRDUP_VAL); - if (ret < 0) { - av_freep(&buf); + if (ret < 0) return ret; - } } else { av_freep(&buf); }