From patchwork Mon Dec 5 22:08:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1693 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1862114vsa; Mon, 5 Dec 2016 14:08:56 -0800 (PST) X-Received: by 10.194.84.6 with SMTP id u6mr51025310wjy.185.1480975735987; Mon, 05 Dec 2016 14:08:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p188si603746wmp.142.2016.12.05.14.08.55; Mon, 05 Dec 2016 14:08:55 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED00868A079; Tue, 6 Dec 2016 00:08:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f174.google.com (mail-wj0-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 062FF689FF7 for ; Tue, 6 Dec 2016 00:08:37 +0200 (EET) Received: by mail-wj0-f174.google.com with SMTP id tk12so7660068wjb.3 for ; Mon, 05 Dec 2016 14:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=aM0rvuciJlkMeqv0XpWYTjqKUdrlgjhCmafIOo/4U6c=; b=vbssnBWvHHtN07bHzUSQd8wYwaFJCmcwvsu2cv7l9C9PPAvIcQg4iVNOsxvWO8sg2X Mlxuwadife5vzhoJ9tiBiGLCynp7MOvSi1LBE3L0mJlzJfHemAydQU6QGbNqpB0gZtJl X7Q9bc9NpP59ZwhR3xBv2qhKsHA/jxAd0itToGXBYsAKDpvLAReN4dbhY1yET8cJV+Q6 1A5tk0fUSyZ3oj+WVc3O+ki3hrphH2S8XUlDvwyYHCUy8OgVLw4sh0iZxuBs2bYTTmTP G9ArkxKL2K5NjSj82nQ5yVco8snix6NeNxKb7sm1a5UieutTQiXy08UFPdNNJcyNolFj 5dFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=aM0rvuciJlkMeqv0XpWYTjqKUdrlgjhCmafIOo/4U6c=; b=QpSkTGXhy/mFLa5pmD3q4cESZ8t4i6bt+IkzCyJh6/79XTdR794PIn6UTHPI4NFCjf qUHDXLfO0bH47TTeAj1xPQzf8BR2fORNcA+LmnI8odMmFffIHo3zVT8X1QDEJpaRTbyK 0gF2q6OLX46sAM3K5y/f6ALEe5RcvrhsQkEaBzHuhXZhIK0zpxValId8aZOEyS/m5OJN miR7ETNJZkfR4EDysnmrGjQMjX6NusEo3VFi7M9a87IJ1WD499+GByBYFHzdsNH/nB9b sKEfIUiLa+INLeasLSMAUptGs2aOhwTcWEuSnbiYd7f2+tLQd42aN4rTKehGuSAEFMXs XKwA== X-Gm-Message-State: AKaTC03/WfFAwNldlOR1vJRW91r45NYUi4ZKIQyb1ovJ7EIfUoNTaYaPylkg/gU6CM4iMg== X-Received: by 10.194.21.35 with SMTP id s3mr50923245wje.192.1480975726243; Mon, 05 Dec 2016 14:08:46 -0800 (PST) Received: from [192.168.2.21] (p5B095538.dip0.t-ipconnect.de. [91.9.85.56]) by smtp.googlemail.com with ESMTPSA id z6sm22469745wjt.24.2016.12.05.14.08.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 14:08:45 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <0ad86466-7eb0-279a-3181-cca6acef1866@googlemail.com> Date: Mon, 5 Dec 2016 23:08:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] yuv4mpegdec: fix leaking pkt in yuv4_read_packet 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- libavformat/yuv4mpegdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index a91645f..462b823 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -295,9 +295,10 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_get_packet(s->pb, pkt, s->packet_size - Y4M_FRAME_MAGIC_LEN); if (ret < 0) return ret; - else if (ret != s->packet_size - Y4M_FRAME_MAGIC_LEN) + else if (ret != s->packet_size - Y4M_FRAME_MAGIC_LEN) { + av_packet_unref(pkt); return s->pb->eof_reached ? AVERROR_EOF : AVERROR(EIO); - + } pkt->stream_index = 0; pkt->pts = (off - s->internal->data_offset) / s->packet_size; pkt->duration = 1;