From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 10EA348B88 for ; Thu, 7 Mar 2024 09:47:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5134068CEE5; Thu, 7 Mar 2024 11:47:24 +0200 (EET) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97B1268CD95 for ; Thu, 7 Mar 2024 11:47:18 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a45cdb790dfso63490166b.3 for ; Thu, 07 Mar 2024 01:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709804838; x=1710409638; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Z590a1vtBJRD1BQhVJqCY5DYS76Uq9RVQRM3X+leC4E=; b=jyPF0m+7mtvxZ+wlf6Np6dyy7JePtLhbgJcXEV/wciHvFD5GPofj5Grazf8ymanra7 UA8Vi0WhQi2z1iULG011LSuAjO0DJjVliLbtPwmqLWwtajy4cdzs4uOCdlxwoNXkmnQY R2sTlIRCe2s0GGimVeUCoZ8th1+MAHr+DBsL9PEHekHujy68rJlOGpkEgUvEmTGA2cd4 USHxXZBWzMYwsDioVN2gZM1Iub2rQWSxjJVKJfP6oDEzxWee6jNDBKme8HuXr378N/0+ lz9mf7eaROrH7tGDANTbih51VBSYkrfP3t1bU9P28+F5puTNI8pBWCBIkT5meZjf+dbP 0TWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709804838; x=1710409638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z590a1vtBJRD1BQhVJqCY5DYS76Uq9RVQRM3X+leC4E=; b=A5zYhvTaIoJsqLULHMG46sGuSyahD/dIbjgj6j5h5CFnNc3bScdAyGRpY0zbVWnbeT fvPqqC+BUSFX/8fupw+SkkTRFMCwefaXfxggdXwpRSs2+/uJO9MPZNrZjzAJxcYA5Jg+ 3D6NEoKe7jaBxkXqDbH6MJChEi/jFf5TMAv3S5wo01mWnICxszv2y8aVlkJQqaJk6hOY 4LpYXIQZqd+AJcA4t4vpnSiUHr+HWU8kYn5dvAZs2xzp4RrEjQLSGR1OMNG59/LvtJg6 CivIAjGGxlXb2xNM8R60T3QCZdBrPZqNcRm8J/a+tffUsyqEhYSFmOA0w1irBtSOOoU+ 25oQ== X-Gm-Message-State: AOJu0Yw5wovAeZKugkqGJGwAhggMsgMS59go98x3u+NraC2QmN8ZJhcA NqlYgOavgpEUif4K7hEYPhf2jcenE1tRZXJZgAowZcjYOgkxu5wfclvt300Y X-Google-Smtp-Source: AGHT+IHzeHLt6ArsjSN6OHYsSZdk5RX2+2VQMUzGCojgSwAveYoeoWMugk8oQ3Aab+VfCYUkkPGG5Q== X-Received: by 2002:a17:906:d9d0:b0:a43:6cd2:7bb7 with SMTP id qk16-20020a170906d9d000b00a436cd27bb7mr11429013ejb.47.1709804837563; Thu, 07 Mar 2024 01:47:17 -0800 (PST) Received: from [192.168.178.30] (dynamic-2a01-0c23-5c35-5500-e4fe-db57-3d1e-fae8.c23.pool.telefonica.de. [2a01:c23:5c35:5500:e4fe:db57:3d1e:fae8]) by smtp.gmail.com with ESMTPSA id f9-20020a170906560900b00a449076d0dbsm6889694ejq.53.2024.03.07.01.47.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2024 01:47:16 -0800 (PST) From: epirat07@gmail.com To: FFmpeg development discussions and patches Date: Thu, 07 Mar 2024 10:47:15 +0100 X-Mailer: MailMate (1.14r6022) Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avutil/dict: Deduplicate freeing dictionary X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 5 Mar 2024, at 16:53, Andreas Rheinhardt wrote: > Signed-off-by: Andreas Rheinhardt > --- > libavutil/dict.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/libavutil/dict.c b/libavutil/dict.c > index 7f23d5336a..6fb09399ba 100644 > --- a/libavutil/dict.c > +++ b/libavutil/dict.c > @@ -145,11 +145,8 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, > m->elems[m->count].value = copy_value; > m->count++; > } else { > - if (!m->count) { > - av_freep(&m->elems); > - av_freep(pm); > - } > - av_freep(©_key); > + err = 0; > + goto end; > } > > return 0; > @@ -157,12 +154,13 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, > enomem: > err = AVERROR(ENOMEM); > err_out: > + av_free(copy_value); > +end: > if (m && !m->count) { > av_freep(&m->elems); > av_freep(pm); > } > av_free(copy_key); > - av_free(copy_value); > return err; > } > > -- > 2.40.1 LGTM > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".