From patchwork Sat May 30 16:05:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19993 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 2D3BF44A6AD for ; Sat, 30 May 2020 19:06:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 136D868AF77; Sat, 30 May 2020 19:06:25 +0300 (EEST) 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 3FB8568AED0 for ; Sat, 30 May 2020 19:06:17 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id x6so7098823wrm.13 for ; Sat, 30 May 2020 09:06:17 -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=74cO64PdOvc353Iu9rysAKS42vVJWjsrgatzzfofQh0=; b=dO32kpacSvpTEIzc9FKFEvfapcusjYvHhgH9FLt8prTyQBsoa37aolKUagBoYnzMqk NN8gI9/iVf2A/wsjGsZ+QaHeYAjsHtxxUNJMIs4JEc/qYkP0K0PSPGZzovNxr8PLiaGn XEVYL23ArFKCKGD1XiFxTjZS0qKNAqM0/wv6WpapGoNBuDIHIrrnN9hfUddwXYxXeMCs NDBlSJIs/tPx0KwNHLSQXkyR2aEA/Ykv6tA6e8VunSiFBcjgyd0JIHy8cCAn/Hi+AQbk iNCnrGnmp39onHSWipiL4IQ3RZXfQ4PH5U0l7Tis+AuENk7wu1WfqWkIAYSCOI74iy4S o1hA== 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=74cO64PdOvc353Iu9rysAKS42vVJWjsrgatzzfofQh0=; b=KESQ+JEPE0aHQ6mK7WUMzz0g1JtJtId7Wkd4l+48nwJ9Rd0fP9vBXyp/N8P4W1aqfu hwBtR0+A/jdnoNGjLMJpC9TnuRTvIhk+vQfTsqoTyRg8f6+t3+/azs1Dxz9rfuarWzX8 TyX5+Lmqwi+MxesHXxj4lCCuA0501axmh7/UpLdq8iDYFZrCdhtj/sXFBLXVOe60Uju9 Rugeg9LU8xnO0+scm26QkQGTE9rAKCkk/GO2kAxG6KUbNoySG0WpwMXJBpCcDhOwIUFX 2sJ3MPacJ8srxqlgtaZViEkcL2KOWe1S0Ctd6xmQ4PAD8hFD77usIAg+Q6S4jAxkH3Fv P6dg== X-Gm-Message-State: AOAM533qNlifYF+J22zRnBtrKGOW7hXHIUEU4DuBbQLaVhxiBf3mTQsq 4ijKr7RLTLO/EiOMwUI/8L4UI3hu X-Google-Smtp-Source: ABdhPJxDwtxqEuBhLT0jGiOnw7i9q1dLn1r5Eb8NgvDHuZNuvAQBauqNbf+stJdiZoidxH0qZSZlSQ== X-Received: by 2002:a05:6000:47:: with SMTP id k7mr13238722wrx.233.1590854776290; Sat, 30 May 2020 09:06:16 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:11 +0200 Message-Id: <20200530160541.29517-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/36] avcodec/vp9_superframe_bsf: Don't restrict packet size to INT_MAX/8 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" by opening a GetBitContext on its data when all the info one cares about is actually in the first byte of data. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_superframe_bsf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index a7faad3abf..29d1c759c7 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -135,8 +135,7 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) uses_superframe_syntax = pkt->size >= idx_sz && pkt->data[pkt->size - idx_sz] == marker; } - if ((res = init_get_bits8(&gb, pkt->data, pkt->size)) < 0) - goto done; + init_get_bits(&gb, pkt->data, 8); get_bits(&gb, 2); // frame marker profile = get_bits1(&gb);