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 C711549E2C for ; Fri, 12 Apr 2024 19:11:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8677068D2BE; Fri, 12 Apr 2024 22:11:29 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE9EA68D28E for ; Fri, 12 Apr 2024 22:11:23 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1e220e40998so9222925ad.1 for ; Fri, 12 Apr 2024 12:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712949081; x=1713553881; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=1UngmStQHyZf+khViWn/7PNhJzhMam+KMqNGCYtH498=; b=k9m4ARyOYrpYWBLvrTZ4lfjpYC1RLEERrmUtUhFM6SSR1VDShSXpxpNRIJLNaRsHP6 4SBGwOUc6MC8vi0SG+N/RFpAVVkjnp3K7AVTX5zcsKephHQkuSUdouRp4xezZaGQzVuu tXz5E9MJ4cz9b8SlCqdkjtFTl0kMtQXziAmiyXZ7Aq3fw9We+yeqHFSIKDWiL+7WJ91d LoPPQEM5Ohrw/9LJOwfiFz2ms0J535aWebt0Hsl/4Aibfh8bCrsub9J63uBVvD091vPt QTOwGdpEoic0zBFl6ObgnTobalSHhRZBKJIAz/qoDoKQrWeIeKwzCoI6eEpW4zMvd+4j ztaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712949081; x=1713553881; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1UngmStQHyZf+khViWn/7PNhJzhMam+KMqNGCYtH498=; b=biMGqNNMB9X6pDuneDHsxo67+l6V3RcNYH0Le2fQDa7AJOetqF5xcWQJilYWt+TRDk Dmi8iz0wrsyIHqM2kz63YTK0e2CkC+cOQeDXy3CeTQEIIfRp9TRgrMszFX2gL2C0z9AD j8qj0acdGqcRz3IFur03BPon7YdQCqlFkjjnLUZEES00ISVOXbGQeUzOPSbXTISewU9D UCXic4JA6eTvvhbkw8P6x/G/5R5eEKQWtQHaqez9LWr2iu07qA/I98UDTLYq5c9WwyUN 0+OnRG/W2EhumC4ewueZxSnuRKYMPR1dDj90iyOjNwcvOBwJZoZmKcoVBPWKz816ZcjV Ptug== X-Gm-Message-State: AOJu0YycpcQujWhjphOP4oMDCX60Ioi9WKiIauuH/9rP5JWZnzAAOHwI P0DxTI+4YsERJ/erZAhLZbOJd/htkoNDWjj5lfHsggg3aI75AKb/z7PZZA== X-Google-Smtp-Source: AGHT+IExGny2kQFBKTsKkSRQ7+sTGMaEV13RcXFYlQC1DLFOcz+4AA29GYGVVwL8yTLkNRsHgno6/w== X-Received: by 2002:a17:902:c101:b0:1e2:a5ee:c0a2 with SMTP id 1-20020a170902c10100b001e2a5eec0a2mr3293284pli.31.1712949080587; Fri, 12 Apr 2024 12:11:20 -0700 (PDT) Received: from [192.168.0.16] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id v21-20020a170902f0d500b001e0a28f61d0sm3352457pla.70.2024.04.12.12.11.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Apr 2024 12:11:19 -0700 (PDT) Message-ID: Date: Fri, 12 Apr 2024 16:11:22 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240412164441.1727089-1-lumingyindetect@163.com> Content-Language: en-US From: James Almer In-Reply-To: <20240412164441.1727089-1-lumingyindetect@163.com> Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: fix memory leak in ffmpeg_mux_init.c 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/12/2024 1:44 PM, LuMingYin wrote: > Signed-off-by: LuMingYin > --- > fftools/ffmpeg_mux_init.c | 7 ++++--- > libavutil/mem.c | 5 ++++- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c > index 6d8bd5bcdf..e7e2281bd0 100644 > --- a/fftools/ffmpeg_mux_init.c > +++ b/fftools/ffmpeg_mux_init.c > @@ -2851,9 +2851,10 @@ static int parse_forced_key_frames(void *log, KeyframeForceCtx *kf, > > if (nb_ch > INT_MAX - size || > !(pts = av_realloc_f(pts, size += nb_ch - 1, > - sizeof(*pts)))) > - return AVERROR(ENOMEM); > - > + sizeof(*pts)))) { > + ret = AVERROR(ENOMEM); > + goto fail; > + } > if (p[8]) { > ret = av_parse_time(&t, p + 8, 1); > if (ret < 0) { > diff --git a/libavutil/mem.c b/libavutil/mem.c > index b205d3fb25..7f34765fe7 100644 > --- a/libavutil/mem.c > +++ b/libavutil/mem.c > @@ -177,11 +177,14 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize) > > if (size_mult(elsize, nelem, &size)) { > av_free(ptr); > + ptr = NULL; > return NULL; > } > r = av_realloc(ptr, size); > - if (!r) > + if (!r) { > av_free(ptr); > + ptr = NULL; > + } This doesn't do what you think it does. ptr is a local variable in this scope. Setting it to NULL will not be reflected in ffmpeg_mux_init.c And even if it did, it would be an unexpected behavior change in a public API function. > return r; > } > _______________________________________________ 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".