From patchwork Thu Dec 6 19:34:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11311 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 21AF644CDDA for ; Thu, 6 Dec 2018 21:34:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB6C868A867; Thu, 6 Dec 2018 21:34:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09D6A68A80D for ; Thu, 6 Dec 2018 21:34:26 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id f81so2234916wmd.4 for ; Thu, 06 Dec 2018 11:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=yY+TqmCMWORGCYQKZke8Zv1GtfQWvbUuYkOVu6AWT2A=; b=Z8iXRY0Oz01jxBdjQrPRXL+rcoNc2nJmcDAsfL9fsjrKhOimLMzylSR+iGrPCtMuMe wTwx9FrKIreh4E8hfyc/Q3Wiy5aG+Tqqkw3soReraQRUK+lU+Rd43qRcXokFQlgo7+S0 3nnWrFSV5JHZsynmjNZBVPr1G+W43zhexgEd5fY8i6EXuE/QQr6sYaLpWLH0kLelf59C IoV54lcwUctJfDwyOzgcTfxADj6KZfvwLCC5vngD2+CBHnKFKnykbQEFHrX6WBZlXqze vf89oqgRtxvCUX0Z/uj4eWsumD0JtIbvHFcQOJJdwdSEQp8WmGf7vsnWMKI/Jru3L3ln vmhA== 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; bh=yY+TqmCMWORGCYQKZke8Zv1GtfQWvbUuYkOVu6AWT2A=; b=Q3U4/8jg/KAH2FXsO2twaoWF/N7H2ZyUqkNB1kZ2WbOtYam6L2QvkqZTNaEQV6RKpg oxVUnSdfIiJLsEalFXBH/L5ZWhOhai9aRq5JQgsn5Miz2ZS5lM/1ufgeZskU2KIajBCJ pvOgwLxduW2V7PMv47XmcLKTgMhgseU9wNap4vsOgo66PTk4GhjXjVIisPQiSDH/ptN8 VBlIHnWzFCoM/lCWwWY+DBKa++mLHQttZnjqcFnLXd1ns7qwuxA7u0mDs00Ba1ZV/MSe XTAshbHaGpZUM3jcTpWJlWmWqEolc6vtHlTuEPyMf9yYGApyUX4yoraQt2WymJEWXqFd /8zg== X-Gm-Message-State: AA+aEWa/4/ZPQ+kGgxkbIEpSdFruoGfjEx+Ai/L4MR8IrR/pqX3Q0ZCw b6JSBLmmAkX6s2eikHCe5OSCFxPH X-Google-Smtp-Source: AFSGD/VezkjOv2gtVmM0v9n2FVHc0U5JWf2w/wN6rAWY+TOxMsyl0ZDtW1PkDdoY1Az7shwJV/CxnA== X-Received: by 2002:a1c:7dd7:: with SMTP id y206mr20599388wmc.50.1544124874533; Thu, 06 Dec 2018 11:34:34 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g201sm1499995wme.43.2018.12.06.11.34.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 11:34:33 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Dec 2018 20:34:18 +0100 Message-Id: <20181206193424.21383-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/dpx: check version of format header too 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/dpx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 538a1b9943..0297287938 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -106,6 +106,7 @@ static int decode_frame(AVCodecContext *avctx, int buf_size = avpkt->size; AVFrame *const p = data; uint8_t *ptr[AV_NUM_DATA_POINTERS]; + uint32_t header_version, version = 0; unsigned int offset; int magic_num, endian; @@ -141,6 +142,15 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } + header_version = read32(&buf, 0); + if (header_version == MKTAG('V','1','.','0')) + version = 1; + if (header_version == MKTAG('V','2','.','0')) + version = 2; + if (!version) + av_log(avctx, AV_LOG_WARNING, "Unknown header format version %s.\n", + av_fourcc2str(header_version)); + // Check encryption buf = avpkt->data + 660; ret = read32(&buf, endian);