From patchwork Sat Jul 13 15:51:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50526 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp1432451vqb; Sat, 13 Jul 2024 09:01:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXx7/41heD+AE+JWwFOytmXDCGMEh/imBmoZxcYqXNaEM7HVXVmyfFkmmsgtjU8Z3x9QhIfLzfGnw75Pj+ZkW3BZrloDYPQH4UwIQ== X-Google-Smtp-Source: AGHT+IErRuARtz4GG0xNFxYp201LZK3KltcGmm2GliQQTE5DqH0GoqxwvyS4AwdV1yWKOGzajcr3 X-Received: by 2002:a50:d70b:0:b0:582:7394:a83d with SMTP id 4fb4d7f45d1cf-59af7f2dc2fmr1396526a12.12.1720886508784; Sat, 13 Jul 2024 09:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720886508; cv=none; d=google.com; s=arc-20160816; b=D0N6zQjy9sJjtkbduQPQt15vK3jlcRMzbXJV7p7zPbyNSrUfo9BUObOt3F/kZsuuN1 T3/2z4njfiXO2IL+FDr02mrkuUm1WESlZUWfwSBBZECV91XQN3iOq29DN5HChJvLp+Da aLs/h4QLVusYLbetFl2g2c0Jh5mj66TJc6q/K6sS6KEeg2UmK+9lawoVzcVmZs9nkPpu e54+3VOTcNLPRHtBWaxax3nWGC7MmWcX78fxu7tfGyGx7HcpVeUqgV7NWkUYt5nMStgh CmXIopA+gxCgYYnhWkMqi6UmxM4qhe/ukKK1eEghfiJ6zE0Cr54veguqg1U/laJmympw 7gIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=e/8kVyGbWQmh1eYbkPYSdQnuhKLcmP3Ecj1xEdPO8wA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=BRgfBGrcHxQET/ts7E4lSF9v8XeYy7Kdq2ZlWjFuL4Rl1NfBlRFmn1Ydw58y5+mD2I vDQ/swybWU2zkO5t4p9AQownKWX+UJ5NuqqpaVqN1049jU1QGKFYkEUtXKeGknwQZUVD oTEVvlqjgjMcOIc21lS9QSaHYCesq6QUizLINJf1tzzBYtwDQZhVDDetrivUTkIjmI59 ishY5AZFzXsrsYsold/zyVZWhU3YgX3mxaMhD3wU6FCAP/aECmlOmC1NIfvsruWncI+a An9wPMQW/rALz0HjxwFPns/vPiIdaZg4c8p8LDj0Av2nF39b8xlOsvXgz34ONv6O2yBX LB6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=HHrBpH27; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-59b26a8dabesi715146a12.249.2024.07.13.09.01.48; Sat, 13 Jul 2024 09:01:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=HHrBpH27; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41A9268DB36; Sat, 13 Jul 2024 18:51:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16E7568D9E2 for ; Sat, 13 Jul 2024 18:51:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6BEB21C0005 for ; Sat, 13 Jul 2024 15:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720885866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=BeKaJwR+U2c73fJdnRqaYp8ez9HXTb6ktgeYgyakjrE=; b=HHrBpH2751nBeooIXVHjsV6RW0rsPHtfUecHTXAB8YaRt9V+KS53nAIvx7T5ZvaPcN/zoF 66uj9WMKBcoKpg0ivAQisDvs3AInGNJlqtZ0hA4Lc4fh96OKlwiNTmn9SdM8xLRwDgyq7f z7hybpY+z5uQ0ZD4SPeBjCtuzbwzrHpmdLTPXKHOoBc4Q/RliMaMKaEJoc6fUZ/IWZVFk4 F3ZH9HE8ODBFIdxaj5A67d+lqyMRi2upX/vgY8I0SPPxWe5qJDAVSA6FLjTCcw05/sf5Yd 03EAOiht1l8lk165aCCfUe8saQZxwogdvX8rmZz5A8YW7AdqHawxaLrYKM97nQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 13 Jul 2024 17:51:03 +0200 Message-ID: <20240713155105.2161442-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] avformat/lmlm4: Move subtraction after check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u3Sxm4yhIWZf This is not a bugfix in code but coverity only, it does look a little nicer though Fixes: CID732224 Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/lmlm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c index 209b544ccd8..c8355e7a8d6 100644 --- a/libavformat/lmlm4.c +++ b/libavformat/lmlm4.c @@ -91,7 +91,6 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) frame_type = avio_rb16(pb); packet_size = avio_rb32(pb); padding = -packet_size & 511; - frame_size = packet_size - 8; if (frame_type > LMLM4_MPEG1L2 || frame_type == LMLM4_INVALID) { av_log(s, AV_LOG_ERROR, "invalid or unsupported frame_type\n"); @@ -102,6 +101,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); } + frame_size = packet_size - 8; if ((ret = av_get_packet(pb, pkt, frame_size)) <= 0) return AVERROR(EIO);