From patchwork Tue Nov 8 22:59:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1353 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1948300vsb; Tue, 8 Nov 2016 14:59:57 -0800 (PST) X-Received: by 10.194.202.195 with SMTP id kk3mr12253540wjc.37.1478645997082; Tue, 08 Nov 2016 14:59:57 -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 fk2si18978301wjb.20.2016.11.08.14.59.55; Tue, 08 Nov 2016 14:59:57 -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 4722A689D34; Wed, 9 Nov 2016 00:59:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61784689A8B for ; Wed, 9 Nov 2016 00:59:44 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so25656882wmu.0 for ; Tue, 08 Nov 2016 14:59:47 -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=qYswKkMXI5MAb4LYdEgptcG9dBbn8x1lywt5z7UtFg0=; b=Pxvf+IwTTQHc2ruBUYW+S6KOZWSMIGSiuNR6rYIztyU7NqcbRPYPJS54LKsDtfv/Zw /KD1e5zPxhya83MunXERMdBcvJ1N8FaGNrBu/h6miNFpn5PNpkVH27Q2F3qfhnE1Qa8H jRtg1owmmstCyGZsU38aVtPyPI4oCSYcR13TWoorM0ivL/wKo3wa7MHk8Uk1D4dBJlB7 FfeLfKCq4WU4ofvggzX4dINzVqOykZwZryfMXpLmpBlkvMB4bm7KUQ9zc0pGq/AeGRvp 5mKHCDyYqphoWT/cYPUmYmUlJneQ1SaIiQQflaGFSAn5xNKvThkFERZtiEmmssNOqYMs uihg== 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=qYswKkMXI5MAb4LYdEgptcG9dBbn8x1lywt5z7UtFg0=; b=QcdusYyEmkpDaSk/XQU9jqu53STH4HbaV6Agdu1Md7+35+Wb2M5jo1vJDHmQP/f/b3 +K1KuxME9xCjHvlOPP/Pkk2HuCX2Ael9K4hrcY2s7h4KZ5///v8oDRDe6YvtRRFilyiI vOFgnj3zoTUTYmDlSVEwYri6e14thOkABtUJGtr51LFXhFUPDLuE3veK4hfHiwOrvof+ Iv4qWfdcw0hVr5zOOwwUzRF3IjFKb2H6T15AP86KgPctaZ2UvTzz9aGZhkIPl7Itt1bG FPBrPpQV7OzJfplIdn8FxU1WRFeSXr8DIsIHdWXCvsxMmDTx751G/7yJEpwcpYkGwY0n icRw== X-Gm-Message-State: ABUngvf/m6DzStXKh0cU5jhrppSyZmFQ5JBhEkwZ9VBssdesphNRU1sKbWAfK87kxGieeQ== X-Received: by 10.28.17.213 with SMTP id 204mr8451338wmr.17.1478645987301; Tue, 08 Nov 2016 14:59:47 -0800 (PST) Received: from [192.168.2.21] (pD9E8FF48.dip0.t-ipconnect.de. [217.232.255.72]) by smtp.googlemail.com with ESMTPSA id 18sm22025465wmp.24.2016.11.08.14.59.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 14:59:46 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <5d4d54f0-b35a-ca27-6ce6-58f2f919c3f6@googlemail.com> Date: Tue, 8 Nov 2016 23:59:45 +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 1/2] icodec: fix leaking pkt on error 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/icodec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/icodec.c b/libavformat/icodec.c index aad1416..becbc0f 100644 --- a/libavformat/icodec.c +++ b/libavformat/icodec.c @@ -174,8 +174,10 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) bytestream_put_le16(&buf, 0); bytestream_put_le32(&buf, 0); - if ((ret = avio_read(pb, buf, image->size)) != image->size) + if ((ret = avio_read(pb, buf, image->size)) != image->size) { + av_packet_unref(pkt); return ret < 0 ? ret : AVERROR_INVALIDDATA; + } st->codecpar->bits_per_coded_sample = AV_RL16(buf + 14);