From patchwork Fri Jun 14 01:15:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chcunningham@chromium.org X-Patchwork-Id: 13529 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2442244902C for ; Fri, 14 Jun 2019 04:16:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F17F3689FB4; Fri, 14 Jun 2019 04:16:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A615689D73 for ; Fri, 14 Jun 2019 04:16:17 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id t7so256065plr.11 for ; Thu, 13 Jun 2019 18:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xWIqeH6+5hD7cyfD0VUJTEE2CyhbM0rudl4NQrytKOQ=; b=naBb+8pbdgMSKnuDqop2920NfISO7dg79fDzp6UsPhoa267oauQU69BKrLlWcxJMIK c+lXiKSdGZrOs1JIskSHD5jTZPvDE4wRgEC9WYA4DyiMfmsrljvUwimD2UGfe86CSjjk Z7SopvNpOhRSljcL3oWh49Sj0PFUsA9UCo5p0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xWIqeH6+5hD7cyfD0VUJTEE2CyhbM0rudl4NQrytKOQ=; b=dN8zav1AFXllRgw24hGbrlwmvL4fupsgoEKCyzsNEmkrMFLkthdhcz/sXkPBK6fJHu b3Nvnf+9p5S6MYPO6ZS4yRaWsd/PjGG1tWfRu3pIdOvNJCBNVmKPu2g4O8QJOOBH71mC Go4GAOOK6wrrOmFVlb+WLyTtTgIFXXcMjdumH4wzN6suGvRU6wMNUF/DihvCuRm8p3NG I2XM/BkMRf7M4WLQcLz8PlfkAh8+f33N1KX2mlP0PFSAjo48UoPDJJpF2wOkAcjJjun8 keJynuxMVj3IEvnkBn8mvfeApDFfSVZrUGPSGebU5RzyEvrn65oS4SYk7Lk6kJPJJTBj blyw== X-Gm-Message-State: APjAAAU1ljhnBNaJmcJUCay5RX51ljNZ4Y8fJl1WxTiTSJf+EqQ8mnRj 3zxbspShLwwbmb7Qrezx9nr7SujrLds= X-Google-Smtp-Source: APXvYqzUPdObkElqpyhCUuJdn3VSyectQCfnDnew91i5mLz2hoo5oF15dhEoEeOB8Gzkoj2JCF6q8Q== X-Received: by 2002:a17:902:5c2:: with SMTP id f60mr90163948plf.61.1560474975421; Thu, 13 Jun 2019 18:16:15 -0700 (PDT) Received: from chcunningham-linux.sea.corp.google.com ([2620:15c:38:200:74b:ad27:5acb:a21]) by smtp.gmail.com with ESMTPSA id x23sm924669pfo.112.2019.06.13.18.16.13 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 18:16:14 -0700 (PDT) From: Chris Cunningham To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jun 2019 18:15:32 -0700 Message-Id: <20190614011532.147466-1-chcunningham@chromium.org> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggparseogm: unknown codec triggers 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" Only "succeed" to read a header if the codec is valid. Otherwise return AVERROR_INVALIDDATA. --- libavformat/oggparseogm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index a07453760b..e71298d39a 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -24,9 +24,9 @@ #include -#include "libavutil/intreadwrite.h" - +#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" @@ -58,6 +58,8 @@ ogm_header(AVFormatContext *s, int idx) tag = bytestream2_get_le32(&p); st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag); st->codecpar->codec_tag = tag; + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + return AVERROR_INVALIDDATA; if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4) st->need_parsing = AVSTREAM_PARSE_HEADERS; } else if (bytestream2_peek_byte(&p) == 't') { @@ -73,6 +75,8 @@ ogm_header(AVFormatContext *s, int idx) acid[4] = 0; cid = strtol(acid, NULL, 16); st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + return AVERROR_INVALIDDATA; // our parser completely breaks AAC in Ogg if (st->codecpar->codec_id != AV_CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_FULL; @@ -147,6 +151,8 @@ ogm_dshow_header(AVFormatContext *s, int idx) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68)); + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + return AVERROR_INVALIDDATA; avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000); st->codecpar->width = AV_RL32(p + 176); st->codecpar->height = AV_RL32(p + 180); @@ -156,6 +162,8 @@ ogm_dshow_header(AVFormatContext *s, int idx) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124)); + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + return AVERROR_INVALIDDATA; st->codecpar->channels = AV_RL16(p + 126); st->codecpar->sample_rate = AV_RL32(p + 128); st->codecpar->bit_rate = AV_RL32(p + 132) * 8;