From patchwork Mon Nov 20 20:14:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6233 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4364024jah; Mon, 20 Nov 2017 12:15:03 -0800 (PST) X-Google-Smtp-Source: AGs4zMYtfRzTDIScZPHM1J2yEl1CKnQZRbv6nABN+lKM6efGcSLTreaeT1nScl655+f97BjVnVk9 X-Received: by 10.223.151.49 with SMTP id r46mr13489253wrb.238.1511208902996; Mon, 20 Nov 2017 12:15:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511208902; cv=none; d=google.com; s=arc-20160816; b=e1kPM4ihvfjXerzdGkYkR9sgc0WvuAx6GS864mtvbNxNxLSXTDHQMHYTo87Uy57gKC objWuPTYup4tAndn1hdS2dbei3PpBcELs+6LAqMntiMOdyij5bS/54URtHuKkBjOO79B p0CQ4ZLrLrmdyNrrQvzb34/ilemfFsMmuI03/F7TJ6je5SYB+dbCXGK66xQyyci6zwCp BnrAe0gCG+Xh0kiZGm5NAvaL2Gv9N4o1GQNUfDv/3W0fa6CLi9qPqbLh5iyoCQ+RlcPg 6WB4GdBkfjDsUTAKbE/XFHzr5Sd6iJAtl1NqMRBxgoG6QnblNTzIELzq0J4aBDh1reA4 SzSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:dkim-signature :delivered-to:arc-authentication-results; bh=qqQxjtYWe6hAVy8v7Hg3I/k4SadJkQiltwM24LGO3bc=; b=PbLkYRXyJexILPCHp5zt18ojNONUnL26ahJosbzW2ft9tSSCkw64HUGQ6wYtANgtzJ 3x1Ict9WmZ+stuGpkPYezj1/rNAjWXeUZb+WtGLtoWb/iUlpY92uctabGgIDnf/LEaFZ 4zz7LspjC5+zjmnpqrP2mSB8gqu/VFl16l2o21x0mLKA4wEGmcd8qSQNbgCfNt1Kijxo 1wCNeTNfWmJoAtPTJbY0zJO+KYmNZqoPgknqXh694UYBluUcfa6Hi/G6lAxQIkaEYgmn s4DNrhhUZri6uHqqx6m3he6vwasXzsWwiO4rrk0hzy4yUy106RKN0d2eIjVH1VrR7/jQ fN8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=RUoFX+qS; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=Vw1y4Jwx; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l79si8024595wmg.191.2017.11.20.12.15.02; Mon, 20 Nov 2017 12:15:02 -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=@google.com header.s=20161025 header.b=RUoFX+qS; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=Vw1y4Jwx; 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=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11D57689A32; Mon, 20 Nov 2017 22:14:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69365680B8A for ; Mon, 20 Nov 2017 22:14:37 +0200 (EET) Received: by mail-wr0-f176.google.com with SMTP id k61so9230217wrc.4 for ; Mon, 20 Nov 2017 12:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=ZODSusPpLxQIGK2SKTNRNf3uBKAUFdhrROFvfcdjTXc=; b=RUoFX+qSfjC+OTBMVf50xXOmk5H8kAZZqALpOrIR0qZ4eazkGSNRSLH8Cy2j2OxXDQ IDS+k4wfUu5mKe1bLJXi52OmfPYqxrbHUpBopPj+ZMgaR0/7DfgfItCWjBB3nnM1uJx3 XLJp+vZ2vqs7A/NksJ5VEI19aSjlx0CG5PBiPshzWuxzwbwExuhgsQ3/TFQx64649Oab 7qAVY16Sey2R2jxhiuLW2+1dIjvCFq1j+F3+dkJQE6WIdTS7m612Gt2hO3sfEDY/jSSv mdC19T162sX9FFvOAW2rTHlB48AHcKGIi8GaMl8Ynt7xULRDOI5rlWlUNrnmYiJ6dGpp yR2Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=ZODSusPpLxQIGK2SKTNRNf3uBKAUFdhrROFvfcdjTXc=; b=Vw1y4Jwx5ubNRXnKNbtxxBbbuZjbeaTfzL4fqomu5xg2qwIrRcwF3j6UsImPPLdjBQ NST4R+JKenAFefpxtYzP0J+N3XkT4HmbhuPzbnJwIA1b84Tk3jKPAT3bBKo8Oa4lWVxo oihRjg9Ca1AGpECEPmKdrduJ6JJz6xZgnGMPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=ZODSusPpLxQIGK2SKTNRNf3uBKAUFdhrROFvfcdjTXc=; b=iwqncGcTzK2lZeNEQumIaWMToIHpeTogJBmzoFvmig7qBYsQ9kFkaQDA2owJz8lvKq 0Mw1aR1tKffOcHZA0pHt+kzb2/bYNz+bqq5xZq3DBT+xKZ7GeMxvi4G1YP+GlKWXtUJv YQro+LtnzzYvNNhAvSA1L3jTlzC6cuL757gdG3EJc5h0zTVrD4gy8CK53TyBwMu7++6K Cj1fV8lJ6GOuCH0GRVv7imiAkhylyDvzJYIUodUSGHrgOf4AabjXiB0MPKxCpRh52Wnn +4o3dSTRU6w9yeBv2Cugz5mYI3p3si1WpAwF3avODH9Gwom1cx/W5JmbEIc4Cvdc9/Qz sldg== X-Gm-Message-State: AJaThX7dPJHzuKSgzCEf/CkU3ZOG5egcmNu1Txmz/3PXCVq0prUy+TPF /6qM+4MiJLSxdByZENzPJljxaA9psdLnhpfGxO8prcBAVro= X-Received: by 10.223.136.253 with SMTP id g58mr13144251wrg.86.1511208893847; Mon, 20 Nov 2017 12:14:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Mon, 20 Nov 2017 12:14:32 -0800 (PST) From: Dale Curtis Date: Mon, 20 Nov 2017 12:14:32 -0800 X-Google-Sender-Auth: 1K8IT0wh_83gZ8mhlfSBV0YqTiM Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [ogg] Close ogg stream upon error when using AV_EF_EXPLODE. 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" Without this there can be multiple memory leaks with unknown ogg streams. - dale From 4fc9d288c50891a9740facc549c895da066af71b Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Mon, 20 Nov 2017 12:07:57 -0800 Subject: [PATCH] [ogg] Close ogg stream upon error when using AV_EF_EXPLODE. Without this there can be multiple memory leaks for unrecognized ogg streams. Signed-off-by: Dale Curtis --- libavformat/oggdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 97ad1a27d1..193a286e43 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -719,8 +719,10 @@ static int ogg_read_header(AVFormatContext *s) "Headers mismatch for stream %d: " "expected %d received %d.\n", i, os->codec->nb_header, os->nb_header); - if (s->error_recognition & AV_EF_EXPLODE) + if (s->error_recognition & AV_EF_EXPLODE) { + ogg_read_close(s); return AVERROR_INVALIDDATA; + } } if (os->start_granule != OGG_NOGRANULE_VALUE) os->lastpts = s->streams[i]->start_time = -- 2.15.0.448.gf294e3d99a-goog