From patchwork Thu Oct 8 19:53:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22768 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 10C0944B58C for ; Thu, 8 Oct 2020 22:53:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECB8D68B951; Thu, 8 Oct 2020 22:53:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79D4468B7F0 for ; Thu, 8 Oct 2020 22:53:40 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id e18so7893993wrw.9 for ; Thu, 08 Oct 2020 12:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CNjqtk8CNdwGOb+Mnlm7Vjb9JAuD8A/+amCX5Qk3/xw=; b=cS5ggfaKFY/u+Tu//es0F9FPjz1XsK91tP0iIWqa88mTiwPnt+P+AB5JrpuTSoo6FY 98ZwsV0RWWuChdC7uznPbRWEe/NrWV9OqSpZYYqkzJoWRmcKAyLtQiPRyRtHd6TYOTur MGM102FbCUUD8Lb9+ZK/sk3LvZJuO+FhOIn1K9uP19k4COPGEhvPg/w6mK6TTJbM9MDB RPgybOIXZ//XONJmw1FeSZHKOgvAQsiogklvWsxFavLK1Ne4AC7z6gvbI0cIPotC84+R 1AB9TiMO11VJR3pOHaQq1QUVXT7DVWEVut8tHmuPDxCL5X6Cj0x6RZq8YiHjGcKX4GY9 MzKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CNjqtk8CNdwGOb+Mnlm7Vjb9JAuD8A/+amCX5Qk3/xw=; b=k56wQISF3srj/DL0VdBwDJ4hHS48NOwobc4wBJ62ATYH8P7Jo6CkUJuzLDxg5K/3/J uajgeLVstvNnsfMNat/Rpg7i+OZ43gjxxnZV3HiwcdbMMP1lVt5UR6T+OenyuR7MlrfJ l9BDzZAen3cf4kYHTKFFAiHoAoQDQeJJskaP0iPTqKknw+irlhiOiCTyJrgOI4aAnZq4 4LMigfJaX2GCX39J4sMYGe02jnRqD+i6/4lCuU98bCnujrAznh1cBKPxgFqLHCH28IOe Ibrvq93OLhGsKdwQiordjQxMVBBXRAFNZOUVobkwJ7AnVmz+gbHbzGeZyhqrNoOms/f5 vSEg== X-Gm-Message-State: AOAM5300KvuqWM4Og5PSCxhdAhXQb4X3MyI4q4BfAWVrzUywxQhYtnSA pkkloHLLzYZACAzxcQ//xVFPV+M7q+w= X-Google-Smtp-Source: ABdhPJxlh/0USDRSWpFPGNUYJAECkawDILR+Yhh8/Xtn4zCpWQf3kTltrGuKO6G57VIYi8ubPUP5fQ== X-Received: by 2002:a05:6000:12c3:: with SMTP id l3mr11677010wrx.164.1602186819402; Thu, 08 Oct 2020 12:53:39 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g14sm8776203wrx.22.2020.10.08.12.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 12:53:38 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Oct 2020 21:53:12 +0200 Message-Id: <20201008195313.471755-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201008195313.471755-1-andreas.rheinhardt@gmail.com> References: <20201008195313.471755-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/mpeg12: Don't pretend reading dct_dc_size_* VLCs can fail 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It can't because the corresponding trees don't have any loose ends. Removing the checks also removed an instance of av_log(NULL (with a nonsense message) from the codebase. Signed-off-by: Andreas Rheinhardt --- libavcodec/mdec.c | 2 -- libavcodec/mpeg12.h | 4 ---- libavcodec/mpeg12dec.c | 4 ---- 3 files changed, 10 deletions(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 7e34ec568e..b16cbb6a79 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -71,8 +71,6 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) } else { component = (n <= 3 ? 0 : n - 4 + 1); diff = decode_dc(&a->gb, component); - if (diff >= 0xffff) - return AVERROR_INVALIDDATA; a->last_dc[component] += diff; block[0] = a->last_dc[component] * (1 << 3); } diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 1ec99f17e1..345d473d3a 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -47,10 +47,6 @@ static inline int decode_dc(GetBitContext *gb, int component) } else { code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2); } - if (code < 0){ - av_log(NULL, AV_LOG_ERROR, "invalid dc code at\n"); - return 0xffff; - } if (code == 0) { diff = 0; } else { diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 2494226aa3..7b448d3648 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -490,8 +490,6 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, component = (n & 1) + 1; } diff = decode_dc(&s->gb, component); - if (diff >= 0xffff) - return AVERROR_INVALIDDATA; dc = s->last_dc[component]; dc += diff; s->last_dc[component] = dc; @@ -578,8 +576,6 @@ static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, component = (n & 1) + 1; } diff = decode_dc(&s->gb, component); - if (diff >= 0xffff) - return AVERROR_INVALIDDATA; dc = s->last_dc[component]; dc += diff; s->last_dc[component] = dc;