From patchwork Tue Sep 10 11:39:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 15001 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 A93254496C4 for ; Tue, 10 Sep 2019 14:45:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A8B5687FC7; Tue, 10 Sep 2019 14:45:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1CE56809EB for ; Tue, 10 Sep 2019 14:45:06 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id s17so3563038plp.2 for ; Tue, 10 Sep 2019 04:45:06 -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:in-reply-to:references; bh=6kwLzN/5RL9VAYAZ6uQXdT2uLq2Kyk3AWGlLTLHcq6Y=; b=Z8C1pK8DSIBPvy6lDo5F9UHnrApyzp9Jq0WBon/Qhq7UOAJAua6dlTudpywmtT1NsW NUXHJpuRa8Xopih9td6/tBbgTzJmHB1W0Anef+8l3f2rQ7zKRH2aD2yqEWXLLusypZQw Sm2wLXR+fTbUNTawo+pWcwTko0OXbmYNmEbFRty1q3GY9uqWdoNfhtTvC0vb9oAQik39 6IXBIVK2ThhWfydfvz2MExYyb2vZpexG+1jBzu72RRhRA6/dVNU3YIFxqsBSZNJC8Xkp dLwDRi1+chDa4FRfoH49bBJjN/vrLeMF8JERY0ajDOqkwfXtdlO5ztWIHa75p5EV1iIY uUhg== 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; bh=6kwLzN/5RL9VAYAZ6uQXdT2uLq2Kyk3AWGlLTLHcq6Y=; b=Jp6ehWA1IFmsYpdlIzOyZOqQBL3t73NhyEjCfEO/LmRFEpUtM+VaPt307bu9C0PSz/ wabCWbXCOMK4BmA7VrjKM6dCfYz2ik4Kajm+IpbQAUwKm/VnhITDvSLjzbbtCtUgDUhv sTY/z/73aP5kVyWOrzBkcupCz4/EfurnsKH62JFkkANGRqiw4YgPPFWtiDou8qdhDfC2 uLSAZXmR8tIUMs0RuF0wi8ZnAUblNvE5h0Ul2/b2DJUc91xTLf+OR872gufkuWzLOvD4 5DONuzerrnTnMdCKsH1pEDwzRqdKaUzviIghzd6hJAtc3pZl5qUTURY4qN37GnacpKqi vl3Q== X-Gm-Message-State: APjAAAUGW9BkFKIZQ9B5EgY4v9+4DwL0Ia7IYOBPYtWWbNp3UKBpEV7r Nj0JaJ7PmUdwzHGF2gqY8e7QhctH X-Google-Smtp-Source: APXvYqwHBOdYGJm2DBV8FYFyqEZKNx+myYEzkw7EucBOddJW/3LbFnNSGK+D4Qj/EkrOdMJAYda2tw== X-Received: by 2002:a17:902:4a:: with SMTP id 68mr25127677pla.196.1568115578942; Tue, 10 Sep 2019 04:39:38 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id v18sm18187749pfn.24.2019.09.10.04.39.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2019 04:39:38 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Sep 2019 19:39:27 +0800 Message-Id: <1568115568-14548-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1568115568-14548-1-git-send-email-mypopydev@gmail.com> References: <1568115568-14548-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/4] lavf/avidec: fix memory leak in error handling path 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao free the value in error handling path to avoid the memory leak. Signed-off-by: Jun Zhao --- libavformat/avidec.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index df78925..e3cd844 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -306,8 +306,10 @@ static int avi_read_tag(AVFormatContext *s, AVStream *st, uint32_t tag, value = av_malloc(size + 1); if (!value) return AVERROR(ENOMEM); - if (avio_read(pb, value, size) != size) + if (avio_read(pb, value, size) != size) { + av_freep(&value); return AVERROR_INVALIDDATA; + } value[size] = 0; AV_WL32(key, tag);