From patchwork Tue Nov 28 22:03:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6427 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3725347jah; Tue, 28 Nov 2017 14:04:17 -0800 (PST) X-Google-Smtp-Source: AGs4zMbuH9f46Zt4ldsrg41ID1MlxIYyLmMLK41sAXgmAThxMuMXrU7Xm6k5cLTIZ372HfJTXjKF X-Received: by 10.28.229.213 with SMTP id c204mr918139wmh.57.1511906657602; Tue, 28 Nov 2017 14:04:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511906657; cv=none; d=google.com; s=arc-20160816; b=lINLAibwcgiqtobXxeDGRqI4pj+7wmIQr4klPM1Dhb/ac2QUREdPw7N3rXklzJe7l5 nav8FOKhaNDfuINY/ohLHF2MlPNT3iX4h+uXZO/6LnGlOMD3ZNauScrK/EMsFhDqM85Q racPDp7Lz7gVSt5YrtskBitftchpCwq/TpWhwObpeccNdamvtBa/mzTUHaO6+yglAAuu 8P6J5tL4bKqPZiX8DWfLlf5bYNGnw21RowNO5VcVtVxpyiH1M9BhyHFAUobgKEM5GWdJ YK3ahI56QhXzXmPcamQF5E+vl3EuZSh/1Ebr7sp7/GuU3pzopdpIQamc6VcvaEe+IVxu 1Fkw== 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:references:in-reply-to:mime-version :dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=q1HjHUmvJlYtcTxnScJ62HiiAnAuVb3HfX3u72ExJ9g=; b=pL4ALvE5VoPuoQnzhtMdMHNdg52y3OPz1CW4e7iZaWGJa7EhRCSnbM0FSW8VZqW8oz mJwK8SEnV+UrbARt6764t4uHjavvHn5x+wtSbml2AfUebr/GY/YekoenkCjUILf+3aKx Z17vNo77FmKPHLMYP7gmAz0qgIpoP1HP9sviGGz4vR3CSJWd8+Ub7sn89diqDQcvjuXH u3sXyrm5jRhk9/bEVruG2oxbplM6S574lx2O4jc/6lSIAtwqiNEBoxT9AtyABfjQmwic zGCUk4cp7/LUJS4Ho4cmR87FM1ARLS/Y0gO9aHQTQ/V7KOPAzGLvK1jncM/sDdD+NBVN U/5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=UxhXrd9C; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=EfR8YG2H; 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 x130si316873wmg.212.2017.11.28.14.04.16; Tue, 28 Nov 2017 14:04:17 -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=UxhXrd9C; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=EfR8YG2H; 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 0415E68A20E; Wed, 29 Nov 2017 00:04:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 195A3689923 for ; Wed, 29 Nov 2017 00:04:07 +0200 (EET) Received: by mail-wr0-f171.google.com with SMTP id w62so1540463wrc.6 for ; Tue, 28 Nov 2017 14:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=fjBkX0uf0o5VcSXijJDJSJ7Mj5/D+ZkbxekojLsZ724=; b=UxhXrd9CpE6cSwe1SrFFQ73YKJ9wi1ENoF33H1wg48LFBSPYC42JsD0TdAR/5I2e7w 98yFgMTew5/fhy5pzQnmz9ague9/8ZC0UoQM1HvBckXJkdcuwBujORBz7//0DnL/17pj GFVYmOMEQ2KzkQ9SJyjtfX4z1sbkee1a6lJk1ch5GW/3WsdFObjHTtaYM3UMdXEVz67p Fas6nfZ8fRDUCAsp/T003ioOfTi6pvdszemJex/EDqlWXBadbU1WIwDPJuDD6YpUMh7+ oqIHyTYdQb6Xur7IFhjne3p86jUK7FrFs0RY6UhyJrz5mFOi69+9v9dczMsaK67OycVS 9xaQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=fjBkX0uf0o5VcSXijJDJSJ7Mj5/D+ZkbxekojLsZ724=; b=EfR8YG2HibCQqTuKVvAVarvn8m+xT+ZUrmb+VSLmRxBg4fHaf+Sw4Pai20B5AE/LRL 0Ub12mjIZcmzuDzxZY3vuaY2eFNkZTqlk4UrNex7iKfJynXb2Xm6xgDYKz4Ocuir3g8W BVqxhXBqun4L8ADq3pd10pmjyLES/gNq6qjRA= 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:in-reply-to:references:from :date:message-id:subject:to; bh=fjBkX0uf0o5VcSXijJDJSJ7Mj5/D+ZkbxekojLsZ724=; b=swMzPa0quR8eIB4oFPZ5pIDZhrmwYxVFq9fXhS7DixwVh7+N+ELIkCffEMi4xZw0Eo fZi0i9cjWtg7LQB2uYdx9g2TBmHe1GfzASTezvdQT24Nr1aCG5zxtwm26+bFkTmmJPnq 0wZunCeP9iLghkKgEV48r7RGMp2JnjAZKCVzT12+LoPSjSscr8E6n4z92dEaB88Kb1Ci Y5JV/ByCrqBtGR0hTwp3dQ9ooUIq5sgaLioDAIYLyEJrJNJ3R543DcXuEP7eZUamPsE1 AQT3KyY4mLPAaaxQYzQuZLAKZ3DWxVSaxyx46tXfL/FrapTCmb3JbaD4m/XSf3NcAMLi ck2Q== X-Gm-Message-State: AJaThX536apeD8rdnQErRLgZjQiAaHEwPdShV2YXqrzJ1z+6REtdCS01 Xo1r6JdcqqNf/t5IUNkWIgPTUSgLzANIhL+Kfnrn7HID X-Received: by 10.223.165.89 with SMTP id j25mr520896wrb.206.1511906648421; Tue, 28 Nov 2017 14:04:08 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Tue, 28 Nov 2017 14:03:47 -0800 (PST) In-Reply-To: References: From: Dale Curtis Date: Tue, 28 Nov 2017 14:03:47 -0800 X-Google-Sender-Auth: kjeLzrmZY2dfX_pfkAucAz4ql0c Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [ogg] Respect AVERROR codes returned by ogg header parsing. 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" Actually packet() was broken too, updated the patch to fix this case too. - dale On Tue, Nov 28, 2017 at 1:41 PM, Dale Curtis wrote: > Fixes ticket #6804. All of the ogg header parsers may return > standard AVERROR codes; these return values should not be > treated as success. > > Signed-off-by: Dale Curtis > > > From 986e24ed45c5eb222eb87f2aa6ca703a371a267a Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Tue, 28 Nov 2017 13:40:20 -0800 Subject: [PATCH] Respect AVERROR codes returned by ogg parsers. Fixes ticket #6804. All of the ogg header and packet parsers may return standard AVERROR codes; these return values should not be treated as success. Signed-off-by: Dale Curtis --- libavformat/oggdec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 193a286e43..b1f318bfb2 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -543,7 +543,9 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, os->incomplete = 0; if (os->header) { - os->header = os->codec->header(s, idx); + if (ret = os->codec->header(s, idx) < 0) + return ret; + os->header = ret; if (!os->header) { os->segp = segp; os->psize = psize; @@ -574,8 +576,10 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, } else { os->pflags = 0; os->pduration = 0; - if (os->codec && os->codec->packet) - os->codec->packet(s, idx); + if (os->codec && os->codec->packet) { + if (ret = os->codec->packet(s, idx) < 0) + return ret; + } if (sid) *sid = idx; if (dstart) -- 2.15.0.417.g466bffb3ac-goog