From patchwork Tue Nov 28 22:17:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6428 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3737934jah; Tue, 28 Nov 2017 14:17:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMYk5Gn+QOrN7jDY+h/Xl7/sEKq1ZOYkBTrL2rg9nmFKjMTcnMcy/5RPgbNIRZLspS2wsIUl X-Received: by 10.223.139.3 with SMTP id n3mr554904wra.166.1511907470058; Tue, 28 Nov 2017 14:17:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511907470; cv=none; d=google.com; s=arc-20160816; b=TEX8b3TW8ww/dI3suBbz+StAaFDeE929e45cDgFq+o7pgPLJi1searqLpvupQ68bqT 5VQyqhp+9r15XMihAlv7AzHgSh4WXHaIKzwkISiqY3ilD8bwN+nJNKTeLQoC8A7YA4WN T5TFLTH8dhy0I3rd8eQ76r04+YoqmPa+nfNZ5zhfGhYyKxsLhzwyCFHtcS70p3T42vTD BH21XVK1i1Ql+4id463U+WqAAfVsud0L4j6xfpd/TWqDA0qFUvq2l8t0aqtfABQvBtWl 7UNooc5Cqz/QYsBTU0eQ+APdsltLstQb7toDhrMrE19wFjGI6O4YWs9p2DmQHj7UJRX+ 1d/Q== 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=nCTSOEgeTVdb2e2pwOjUSwKuWBTbkM9EWM+8dsVjfpQ=; b=NylVFGv8Gz3SfNDq1Gi5k4mUanEtaU6X6ClLQzYiM6dzZBOtNLHJuy2bomRcapmWo/ M3ZlipMiCyqqzWBBEB3WvXfvl5gKieK83lsg5DB5BlTOA37jjoeMt/B7l5flMdurQNwF Y7q11HEo/VY1sOfw6VPI3/AEquBsb/G7Z83/7pwvYDwEccjqgHaX5irR9x51clBLT4vX wiWUGHxIbUac+WUDX2QqIZ5Uapl1zGm6AQLtmDJA1e64Y5+0EeyaMb2hTKa1U7UPHlTN s+rGrSYAttr1FxWKo8oO3f6+e5wOEoO7xjgzH2zW+l7T7vMF3ZPSSRNiiHlOKjJH48YP UTTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=IYwhdjqT; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=FZYAPM4h; 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 i7si355605wmc.30.2017.11.28.14.17.49; Tue, 28 Nov 2017 14:17:49 -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=IYwhdjqT; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=FZYAPM4h; 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 0842A68A1C5; Wed, 29 Nov 2017 00:17:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2FAE68A08F for ; Wed, 29 Nov 2017 00:17:40 +0200 (EET) Received: by mail-wm0-f45.google.com with SMTP id i71so2515013wmf.2 for ; Tue, 28 Nov 2017 14:17:43 -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=m4z3Lmsx8HcXZnmTywWsA1NxQDCztgqcQPASsSmUuGc=; b=IYwhdjqT7FXBQkLIGvv8VPYXULBdp0jwdmo5ZiFFN7e70KW38AtaD78ZFXU9HdnJya 6fk1GBn86IyTx/nYfGJ7E0iFUZ69ML6417GcqicJiHqMviCutz6gPWEBGs4/G7AOP1/9 7hZ91lvEO9sB1I0ehsH2/3gqNACHvfa1Y7eP17Y+kIEpc1drXwGzAvnGzpA3nOtaETk/ i4QpMPEHvC/vB3ath+hHqRY5V5dPlF4KvZ9SKRU/Ybbw3dsWPbu0PL/9qE+EhxksCpvu om1BjRCJSex3BKSBVl+9MVVa5lsejshtSufuuewwPnkjc5MdRJVkAhjGozjnBadLHKWZ Dmtg== 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=m4z3Lmsx8HcXZnmTywWsA1NxQDCztgqcQPASsSmUuGc=; b=FZYAPM4h/sijZJlPzfiuvsOW9IxAp5lknpoZQvfJUEbWVMpcCT6Eks5RZyaL3CLSh1 MGYZYuEMRPIyIIUyYmsqqVz5qtW39fyMDQvVnE5XuRBrPWyibonBeBWXJjw5m+oYsQCD pv7745UBwqCktB4zIPenLusBaWS1/7xvTAaAk= 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=m4z3Lmsx8HcXZnmTywWsA1NxQDCztgqcQPASsSmUuGc=; b=DD2adNZrPtDSR/adrON2iZI1R8ghLf13IVgj7gz67/RczqFY3197jWqvbSKXB21iie aMz1ZCvQ9PAT2QBd2gCbdlxqW36vdYrCqpje41KEXPmUJerDLfOIp/t1F9gyjrxGl4+G gG1fKg/pIc7BE0L7/pwjHBTE4ilLK6IXXmq3nlOfHGGBW89fk26rsIT6AEeNgCjy+kXR FURBom3amHe8Zn5H7uingQPS+ZqRjhxwpIz053+SnewEyuJBBsd59C1mGs9dll4D5OFG wiR0Kch0/IBxcMZfrcduTC+JWCncp4EAL6vd+j7qNgxC8wKjzpBiZ3uTAsxcAYpg1gOm UhAw== X-Gm-Message-State: AJaThX6lBTyHjvTB1QcbFfQ3oAEZLmKGBczghszclwN7XyTCXdT1JDur 6tr4j5BzTuBV4IeTG4B3BHg2zTPrEJ6p8xpEM0d3Dkwz X-Received: by 10.28.168.88 with SMTP id r85mr950452wme.63.1511907462141; Tue, 28 Nov 2017 14:17:42 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Tue, 28 Nov 2017 14:17:21 -0800 (PST) In-Reply-To: References: From: Dale Curtis Date: Tue, 28 Nov 2017 14:17:21 -0800 X-Google-Sender-Auth: mIFHKAxVn48DSa-3A1nu8mYogEI 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" Fixes bad parens in the above patch. - dale On Tue, Nov 28, 2017 at 2:03 PM, Dale Curtis wrote: > 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 8d3b21ab59d835430f057cfb40a63318b25e7014 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..281eba44cf 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