From patchwork Mon Nov 28 23:46:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1599 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp2134600vsb; Mon, 28 Nov 2016 15:46:21 -0800 (PST) X-Received: by 10.28.214.84 with SMTP id n81mr20055423wmg.120.1480376781369; Mon, 28 Nov 2016 15:46:21 -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 h8si56693382wjx.21.2016.11.28.15.46.20; Mon, 28 Nov 2016 15:46:21 -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 16BFC689DD1; Tue, 29 Nov 2016 01:46:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29B86689CE2 for ; Tue, 29 Nov 2016 01:46:07 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id m203so21614184wma.3 for ; Mon, 28 Nov 2016 15:46:13 -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=EomixOAhGrdwXVeU1uWvNzNnr5aytHladFYAydhzKSA=; b=AMqHoPvCF1E447sdp1V9nAhyN42VGwFIHCPSvSFBzldHpCwyUH2HQE2MyUa95oiQZU +ZE5XfIj3/qBAj6bdxMbuyg4TS84xhD939pXkaJWgqAs36rUayq56qWF5ub1H8rgmSpD V4yS7kHHV9U826XclaeYLlvBFFp7peAGmplfa/O7oUCXj79klORTx0YKEfj2VWBzXMMP 3Va5jH0cQG8Ke5L67IhdZubxhCi73VF+llflBxiU+rQ3NdnvoCz3rR0VTupNMEir3tVf SlnuDjCruy/6zsdmxaLQdeUsRPutyi+6+9aqjO6juq8lRAqT36WLUgVq/F4cTl3j8d0o +z3w== 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=EomixOAhGrdwXVeU1uWvNzNnr5aytHladFYAydhzKSA=; b=kymWC9BPRoWmlJ4X0jXfYF5vrAjkt5lHsdb14TQU2bwnRczJErWDsb4FnfnGyND+la Qcde/IuNgd0rl+dw1fe4Dw99VSL49MNIAHbI5YgLcZHfJq84oQ71iPpXQLc5mCEcim4w LslzG6IxBBeoDGPWhftKTciGAoPqywyRI0lenYQf5PASCWOgJYngHzk6vNESyTxFv6BD KW+r2ag20bxw/qme4Yn2G4uw6z7XSvgeTaxaEONcGQFRV9MBLrY1lT+menDorH4j7TWU AXbTWH2vt47YRd+y/V6gwDFbmXz1o7OeN5QXF14GFwUcM3fImnK0S7X+1ImXEHru8FQ+ dhFA== X-Gm-Message-State: AKaTC03ZbYXZ+0nEilaBPLJiMltE6Y6TeP3r1DI7BDAtsgeZz4XJsT61oIsmi0qF3USVog== X-Received: by 10.28.58.14 with SMTP id h14mr22737084wma.7.1480376772519; Mon, 28 Nov 2016 15:46:12 -0800 (PST) Received: from [192.168.2.21] (p5B095B3E.dip0.t-ipconnect.de. [91.9.91.62]) by smtp.googlemail.com with ESMTPSA id g73sm31308422wme.16.2016.11.28.15.46.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 15:46:12 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <8646ae54-419c-8342-73a6-f6364fd6a416@googlemail.com> Date: Tue, 29 Nov 2016 00:46:11 +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] idroqdec: fix leaking pkt on failure 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" The code calls av_new_packet a few lines above and the allocated memory has to be freed in case of an error. Signed-off-by: Andreas Cadhalpun --- libavformat/idroqdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index b664279..c42b3d3 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -219,8 +219,10 @@ static int roq_read_packet(AVFormatContext *s, pkt->pos= avio_tell(pb); ret = avio_read(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE, chunk_size); - if (ret != chunk_size) + if (ret != chunk_size) { + av_packet_unref(pkt); ret = AVERROR(EIO); + } packet_read = 1; break;