From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9B7964B7C1 for ; Thu, 30 Jan 2025 13:55:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C468D68C023; Thu, 30 Jan 2025 15:55:15 +0200 (EET) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA08768BEB5 for ; Thu, 30 Jan 2025 15:55:09 +0200 (EET) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2ee46851b5eso1012462a91.1 for ; Thu, 30 Jan 2025 05:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738245307; x=1738850107; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=TThbdqUk1//BIBo9R5LMQ4we+/hn3lonZkmwov4eEL0=; b=LFrLU+NKP/R3MR6Upkyf5AyLHZmAinqCVQdpgXqnslkFGa/AV/EqhrtrrHGM/WA1Rg FPPfXHnbrgEArUF89fpSfwABEU+4BfkcY+eaiaD1lmY0db3tTlioIWLbnNg3Luxhmzdw 1BAvsGE4CQnuukhEvUjmn40zbdlm7v505gQl3hKXZQEtBuXNLO42SPLcyhWT3ZI8jAZ0 xnxb+JtXs33zHAW1Zr2GPFV3/LlLUohkcO6GHhQ/wtds6fpjLaCGnourf/dMzqUAd9Vv WORfxR6+G7EddLUHs8gl63/lXoBc6MZF2Fpdfo+DCrzLG/GXe3UtAxWZqsuOb5rt7PIt odPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738245307; x=1738850107; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TThbdqUk1//BIBo9R5LMQ4we+/hn3lonZkmwov4eEL0=; b=GcS562KiD0uLx0kdnR2SbfjXYcjuiQL48FYCYlXlmashhfaaOmCuUsuBn4rkTgbyx+ A/OxOTcb7/jY2Zk5F6WlDq7x+alQuVnYzO51hEohN8+gEYChBw0UhpHtDNFyVpZLlIZu ujiUX5P3HwLuC6qe5NWLCByu6yiGBOqrfU7SHQEMSAokR9pjFCVLDrZqGJg6nwI53hli 7RmX6AEGuY7swijfFq47bIfrrqOV1bmV31dqDUdyppieY5MtgBcfYUZXLczWG+wj8/7m AYG7CZAguY3TwVI7dFNI3HIUozHywQTgQpokxzhsw7XFm3ui9KuF7eTT9blU4nSO75zV WQbw== X-Gm-Message-State: AOJu0YzgC+auw6Q6KiytRoiW2tRlo8id6VYSkAdx+HsgsVAq8eoTv3dQ 0fglD/YR9YDLQ8M3QLTseagpUaGrS5HfYH4XfulwmDuVMGDCBlTvys0oCo7S X-Gm-Gg: ASbGncsERuZH+Cv85nUcT1xUnJs3BM+7anyWYLbxkWwYTBKyzM2F1gc9hflfHKAUQPK J9EQUj9kdkqq9No/FbRpzttN/z8lUcSV98Akd0Y3xUkQvloyqJ1hmJrdsk2n5+nUrGKM10adw1t TF6SHrUtyl3vbMHnwgNNSfL3Vol+Mdg1ATc/rZdBk8mvSeZhdgGZvSGWxNvE4WU2NniMFWuErKA wrN6hWip/MTGB+P34nMA6Xx0e9BnbLzyBkzFnZ7xBbpQ81UoiJCMh0XAs0TNtT0WsIzket13j0T 0g72EBIrFg1ae1bZG8/kNV3U3w1s4wE= X-Google-Smtp-Source: AGHT+IE80+DR22aTF3544IJ+iVx2N4aPdzSHZcnqsNRYsj4HBA4GSzYoGGrHDrts6rm9g2yv2spX8w== X-Received: by 2002:a17:90b:254d:b0:2f7:7680:51a6 with SMTP id 98e67ed59e1d1-2f83abab7f0mr10236956a91.6.1738245306779; Thu, 30 Jan 2025 05:55:06 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:a0a3:5ffe:8b60:ea0a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f848ade8c2sm1775495a91.48.2025.01.30.05.55.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jan 2025 05:55:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jan 2025 10:54:42 -0300 Message-ID: <20250130135442.1642-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/speexdec: fix frame_size for mode == 2 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Should match the non-extradata path now, and fix ticket #11078. Signed-off-by: James Almer --- libavcodec/speexdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index d25823ef6e..b335e2fbe8 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1422,10 +1422,10 @@ static int parse_speex_extradata(AVCodecContext *avctx, return AVERROR_INVALIDDATA; s->bitrate = bytestream_get_le32(&buf); s->frame_size = bytestream_get_le32(&buf); - if (s->frame_size < NB_FRAME_SIZE << (s->mode > 0) || - s->frame_size > INT32_MAX >> (s->mode > 0)) + if (s->frame_size < NB_FRAME_SIZE << (s->mode > 1) || + s->frame_size > INT32_MAX >> (s->mode > 1)) return AVERROR_INVALIDDATA; - s->frame_size <<= (s->mode > 0); + s->frame_size <<= (s->mode > 1); s->vbr = bytestream_get_le32(&buf); s->frames_per_packet = bytestream_get_le32(&buf); if (s->frames_per_packet <= 0 || -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".