From patchwork Thu Mar 25 15:49:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26597 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 4CA1F44B722 for ; Thu, 25 Mar 2021 17:50:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20EFD689F2C; Thu, 25 Mar 2021 17:50:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E418068090B for ; Thu, 25 Mar 2021 17:50:06 +0200 (EET) Received: by mail-ed1-f50.google.com with SMTP id h13so2958549eds.5 for ; Thu, 25 Mar 2021 08:50:06 -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:reply-to:mime-version :content-transfer-encoding; bh=xr/eqk5p16jTYjdIs8CJWYjgR8Rb5iG470eDNn6HwGk=; b=RrLlcMvKRV4O1aBUJHHA9wZ7z91KdS4uQrY2oLyl0xYw9GSB2kqJvARrT1vdumrPjE gBFK+XhPGdIzRfrs3nJyXBjLa79wcz9vzbpsGJxhjUjKU5PBSetkjAnPiqmpAYOEhyqs /PPvJsOvOXtMZZMB46TxQZpYmdpYrzzLHvMiW/RSkno9Y+hl9ZEN+68zL39/AtAS1hVd AZ0coK25+qZTltmOjcQU3d7NDeLlHHVncx3o8OJIvc6wSSQi99gHuSyTJNdZrSEm5lrE 6fhNtuBgsqErIMJMq3Cuh8kPE3MyMoMf1P6TF1jTuSzkgZYm/1FlAEmilhDlI79nvTuS QCGg== 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:reply-to :mime-version:content-transfer-encoding; bh=xr/eqk5p16jTYjdIs8CJWYjgR8Rb5iG470eDNn6HwGk=; b=rgheQ0DH4Xx/YZCnGZysBzdk7asWg9xAd+j0IDdUUrVsAFEG/GTIdyTq4SY9jKPqw/ kLutRm0lHhXo6IljJ8NqwUuxNqXfmdlsd+UOFAjbMHoOsR2+zaDn82vIkcJOZLgmUN9/ AacinRt2a+gfvpY+uRhcNtRbqIMne5dtNj+CE1PxOPiHpiq3b5IJoMDTgbH081dju/0z FJOVL1dOnTtqM2UiEDR7iQ/Cthy5XiXVvZRojQ0ADYSwd0DHxfCnBJ5FUwsHU/C5Fvkj vP1On74e9qigUbj9p3XEWDaUpMSB87nK49w1i0KgtqQCK5/23FdcG2Qaeb1AvBygaopY S5/w== X-Gm-Message-State: AOAM531eRWpv8JIchixyhg9WF77NuE6DHS1VTcUHiAt3iL89Ke7tnyhD Czv7sFgPJ4C5TN8ho1MMZ3bELF9MQZ79Mg== X-Google-Smtp-Source: ABdhPJxhdmtlVnHJHbmIKV/OMQf3IUosS4BGsEheYdS6lrzpUeE61QJwXWpZ3Qem7xCtoIUGFi/IiA== X-Received: by 2002:a05:6402:5203:: with SMTP id s3mr10003361edd.79.1616687405394; Thu, 25 Mar 2021 08:50:05 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id o6sm2859103edw.24.2021.03.25.08.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 08:50:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Mar 2021 16:49:45 +0100 Message-Id: <20210325154956.2405162-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/12] avcodec/vorbisenc: Remove always-false 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" The PutBitContext is big enough: It has just been initialized to 8192B. Signed-off-by: Andreas Rheinhardt --- libavcodec/vorbisenc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 18a679f2dc..f8a08f816f 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1135,11 +1135,6 @@ static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, init_put_bits(&pb, avpkt->data, avpkt->size); - if (pb.size_in_bits - put_bits_count(&pb) < 1 + ilog(venc->nmodes - 1)) { - av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n"); - return AVERROR(EINVAL); - } - put_bits(&pb, 1, 0); // magic bit put_bits(&pb, ilog(venc->nmodes - 1), 1); // Mode for current frame