From patchwork Sat Nov 7 01:06:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23426 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 5531F4499E3 for ; Sat, 7 Nov 2020 03:30:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3651D68BAB7; Sat, 7 Nov 2020 03:30:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 092ED68BACD for ; Sat, 7 Nov 2020 03:30:11 +0200 (EET) Received: by mail-lf1-f68.google.com with SMTP id l2so4513769lfk.0 for ; Fri, 06 Nov 2020 17:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+Z1YeMZ1XnevmkeDdxEOwX9tvDpRKUFY+9BvNKfHJgQ=; b=lGgSyIb3qBMuJDHTgXpweQywXmlWAcBnkBouTfru8/W1ozDfaTVigGHe2FhDvqKKH2 LEg5/3Wvvs6rnE9taMPHSTMptst+81iOXfO1GToR+/AQwiMtLXeliJv7MpMYBkTE5Nir 2PkBUE1CTyb7iN6Dx0o8VZCT9d8HHaEL0WMlq84SDI1g9iGffs4UvD80LgVFP9j5TADA 7Xtn9M8tq2hJlHxpaQ+4lEUfu1S4bqZa5v/PX2IB/2v/C65Y4yVhqfe4vTCukVgfHACH nwqDwLHzkEhTwnuy5bBwhicUxF4m0eX6c/nMD/W3VrS3j3HeuOwQKBnDVe6+pTJ0hoLp BFgw== 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:mime-version :content-transfer-encoding; bh=+Z1YeMZ1XnevmkeDdxEOwX9tvDpRKUFY+9BvNKfHJgQ=; b=e7T2w3yNzgKQiKmr5prZDX5RA02mIE0y4eJ7g6uow3N8uuvt5NqUnRTWOG5ptH9f3Q Y6DXOrpHO3mq9YHcrzlZI0ICtXYA9kuY/JWGLDSmwsam/L5qP8yMytFMIFg8LIdJUanB lZZa7aRIB0MZcUQlaoHhUSDmx2X86rSIlFSrW9FdlarvrLrxPrCBMKGFlUrhKJQQt6cs 1xWT+wxcJVwUj7jk6mLtSFeAeei5C4osDecaqpuVhq8dKnXjCCb3QG96NyHWUVP0MRcl cvJqbioc2oVahYt99LehwBF36b+Pq9toYG4kMS0Lw+Z8dO/pdMnHp9KpCcCD+G3EYjLq rr5Q== X-Gm-Message-State: AOAM530GbUkgtnt4Rf4enV83hEOJr4gFcvzHzNLYgZFqTFKZGV4qHEXa MOtPd+iQb2ujZuPg//Y6p6GHOVUPOwA= X-Google-Smtp-Source: ABdhPJwXCPM6ExNga0CVgHUVv4YO523+WEbL7PjF+X+2UVFAGadzsaW0gDmgebnzbJkxtPRZCfeOEg== X-Received: by 2002:adf:e28c:: with SMTP id v12mr5315615wri.230.1604711170985; Fri, 06 Nov 2020 17:06:10 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id q2sm4277739wrw.40.2020.11.06.17.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 17:06:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Nov 2020 02:06:02 +0100 Message-Id: <20201107010603.552387-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/gdv: Remove dead check 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" At the end of its decode function, the decoder sets *got_frame to 1 and then checks whether ret is < 0; if so, it is returned, otherwise avpkt->size is. But it is impossible for ret to be < 0 here and if it were, it would be nonsense to set *got_frame to 1 before this. Therefore just return avpkt->size unconditionally. Fixes Coverity issue #1439730. Signed-off-by: Andreas Rheinhardt --- libavcodec/gdv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index f00f3ac145..2be1e2ea7f 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -551,7 +551,7 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data, *got_frame = 1; - return ret < 0 ? ret : avpkt->size; + return avpkt->size; } static av_cold int gdv_decode_close(AVCodecContext *avctx) From patchwork Sat Nov 7 01:06:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23425 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 D12B744BA87 for ; Sat, 7 Nov 2020 03:10:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E96D68BA20; Sat, 7 Nov 2020 03:10:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 956B268BA16 for ; Sat, 7 Nov 2020 03:10:09 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id w14so3066756wrs.9 for ; Fri, 06 Nov 2020 17:10:09 -0800 (PST) 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=HGLFWJUD6MeJskxLVcshGN+pCZO9d71mgyBIqXW+pTM=; b=uHul2MqlZbYpQNnZn9w+Abn+A0GHC+Ezwqou1PNlwtIggsIdmRGBzEUSLcNlfGzmq1 hYRmJb5DbnkzvmFGGER6CBe3ibuEdEuNZVIG52xugdpQwfJ0k9mDZdsPhv3mtTF/pPaU ZgCA41g1PlDQK//Pj87fF5BERtoVan5pLgaMDtlsvniaD7ddfUASMBPdjME7f/aBgmw9 85MgdqGsZygmh9xoeS/qZ2P4lTEqKKz/ZPV39gZWB8bSO4Czb5cYXYbJkaVgNGOFOkSa YWIveJKPxaI8DJnabo6ggM/t+vbVy68laQdZqeBp10EaJv6BbGk9KnbbAkTquAL+UI5T 0nUQ== 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=HGLFWJUD6MeJskxLVcshGN+pCZO9d71mgyBIqXW+pTM=; b=O4yKpIqzW3nKkw/2k5mU+fC7eM6RQFQMN1zC+VXTC7JUdAiEvA1ewqvGU9DtczxlOP 2R+2wnw8l+ECQwMgFGwqGYjF8g0jE0v+vK9+b6hQWBvmmszm83HPb2pmN+cKqHvNhWKR 2qVlXG4RXh8Ls+fnFT48mN1ujDLBWB7O8RiCMdnCucT8HhUKeK2COuGR/j6ByyACYgPK E6113nHeR1ukbT0vjXPHdENrLzUeXRhDE0BvcCOJn/OIIJdYMA+hyFGOaezNj1RaYsHH UMQ7llJzX+4DCIudLnKzTXPDxb0Bo88TgL3dznVm2AMVVhfgNlvdeZyUfYvMPTRLc6Q5 lRug== X-Gm-Message-State: AOAM531YwQcPm9JZcNOsIZ5uUjbjUX+KKsqj8v+KJdnCM0afjVYavoNH FitAEZooF7Q1DigbhJ+lYmpdhDNezT4= X-Google-Smtp-Source: ABdhPJySzQ9DvWQM3rt6rg214BAvvj33EvCWs4wTHTTDpwHr+K1/Q8UFybaH3k1NaNNklLNLlUMaZQ== X-Received: by 2002:adf:ab50:: with SMTP id r16mr5122160wrc.235.1604711408794; Fri, 06 Nov 2020 17:10:08 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id q2sm4277739wrw.40.2020.11.06.17.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 17:10:08 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Nov 2020 02:06:03 +0100 Message-Id: <20201107010603.552387-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201107010603.552387-1-andreas.rheinhardt@gmail.com> References: <20201107010603.552387-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mobiclip: Use get_ue_golomb_31() where possible 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mobiclip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index 9fa88e84a0..42d33cf6a5 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -539,11 +539,11 @@ static int add_pframe_coefficients(AVCodecContext *avctx, AVFrame *frame, { MobiClipContext *s = avctx->priv_data; GetBitContext *gb = &s->gb; - int ret, idx = get_ue_golomb(gb); + int ret, idx = get_ue_golomb_31(gb); if (idx == 0) { ret = add_coefficients(avctx, frame, bx, by, size, plane); - } else if (idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) { + } else if ((unsigned)idx < FF_ARRAY_ELEMS(pframe_block4x4_coefficients_tab)) { int flags = pframe_block4x4_coefficients_tab[idx]; for (int y = by; y < by + 8; y += 4) { @@ -1012,8 +1012,8 @@ static int process_block(AVCodecContext *avctx, AVFrame *frame, return predict_intra(avctx, frame, x, y, pmode, 0, 8, plane); } - tmp = get_ue_golomb(gb); - if (tmp < 0 || tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab)) + tmp = get_ue_golomb_31(gb); + if ((unsigned)tmp > FF_ARRAY_ELEMS(block4x4_coefficients_tab)) return AVERROR_INVALIDDATA; if (tmp == 0) {