From patchwork Sun Nov 10 04:07:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16193 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 6B01544A459 for ; Sun, 10 Nov 2019 06:15:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 503A168ACCB; Sun, 10 Nov 2019 06:15:07 +0200 (EET) 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 3659F68980E for ; Sun, 10 Nov 2019 06:15:01 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id s5so39196wrw.2 for ; Sat, 09 Nov 2019 20:15:01 -0800 (PST) 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=fbQZx+oFXjfFu8m5jldoKxOEEgG6894xxf2Z4K+4TSg=; b=V3nhyEnU6DtBSFYcUQr+nBTBDwlCcRpBgLXJJtKTWYWstmov+R0f0gEFUXCRidow3T MenPN+EkQJWRACeqdmRX/O6mZ7iFwCJqCM0EGYEgwz7IfKNH/574TP+dezEmmlyHPKwI NdtviurZkPiOT+SbWbls/f7/EFzWQ8EqyJ1egN1AioV9WLfCG/QPu48++PnW1AYsSiH8 bqz7lfjRFObKhBUCIRDmPV5MnS+kWO8dSrQtvibTpcTqf4jhT9oC0pOJihmRTm+jnuMS EdTSmFdRdP4M3wIxN/ocZUjH2tYx/QaFmgJ35ikTforlgqQ6jNutnGFLmb8WhuSpLFea fs5A== 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=fbQZx+oFXjfFu8m5jldoKxOEEgG6894xxf2Z4K+4TSg=; b=dst82ISMWtgkoiCxCi270mOMfhfowniR0LHUd616+2f4fsjhc5chJvfsMfOGDNCb0/ uSoPhKpzyiICeBPVY91YY6+cJ6HkU70Lbj6NXDB5cC6e9GaHPqp682hqcbhbJFpBkIY4 Ei9weG3PWjalaK9PkW88sNFGA0X2eoWhKq+6EHJP9+q8pUON6tHX0BLZeW6JTYk2BNKL byb64h5Y9T6F8U+s6H/54c/JYS2ZRfmHYPY3H8KDNop9n5QdZKA+p5C/ongi4q3c52W8 SIzlv7OtHEh57y1a0n8CyxwV58zf2NEdwn7RdNGjzsZRq1ilXU7jAmr6ukSXdFUlMHCR lxmQ== X-Gm-Message-State: APjAAAU2yS63wbJtZ8RAbuiCa0w2LXTgiXOvxkT6AnZ6CqY6NnFZUlU3 AZb3xAXVZJtmJWOKblVOunvkFxt5 X-Google-Smtp-Source: APXvYqz2qyB8KegiT0fSVaGpUlvU+M5zZJKINl1+iGhHiserrAKrEINlQla5QaEYoWYFYzeN4n+mjQ== X-Received: by 2002:a5d:5050:: with SMTP id h16mr9013197wrt.380.1573358865003; Sat, 09 Nov 2019 20:07:45 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id q15sm11381781wrr.82.2019.11.09.20.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 20:07:44 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 05:07:30 +0100 Message-Id: <20191110040733.11755-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110035406.11500-1-andreas.rheinhardt@gmail.com> References: <20191110035406.11500-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avformat/icecast: Use AV_DICT_DONT_STRDUP_VAL to save an av_strdup 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" This will probably also fix CID 1452559, a false positive where Coverity claims a double-free occurs, because it thinks that av_dict_set() frees its key and value arguments even when the AV_DICT_DONT_STRDUP_* flags aren't used. Signed-off-by: Andreas Rheinhardt --- libavformat/icecast.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/icecast.c b/libavformat/icecast.c index 052cd37f3e..7d8f92fe73 100644 --- a/libavformat/icecast.c +++ b/libavformat/icecast.c @@ -114,7 +114,7 @@ static int icecast_open(URLContext *h, const char *uri, int flags) // Set options av_dict_set(&opt_dict, "method", s->legacy_icecast ? "SOURCE" : "PUT", 0); av_dict_set(&opt_dict, "auth_type", "basic", 0); - av_dict_set(&opt_dict, "headers", headers, 0); + av_dict_set(&opt_dict, "headers", headers, AV_DICT_DONT_STRDUP_VAL); av_dict_set(&opt_dict, "chunked_post", "0", 0); av_dict_set(&opt_dict, "send_expect_100", s->legacy_icecast ? "-1" : "1", 0); if (NOT_EMPTY(s->content_type)) @@ -170,7 +170,6 @@ static int icecast_open(URLContext *h, const char *uri, int flags) cleanup: av_freep(&user); - av_freep(&headers); av_dict_free(&opt_dict); return ret;