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 EC70B49DC2 for ; Wed, 29 Jan 2025 01:21:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A37868BB67; Wed, 29 Jan 2025 03:21:25 +0200 (EET) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5F2A68B887 for ; Wed, 29 Jan 2025 03:21:18 +0200 (EET) Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7b6f75f61f9so867563485a.0 for ; Tue, 28 Jan 2025 17:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738113676; x=1738718476; darn=ffmpeg.org; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=9cVwVFxMhNAc32HnWmNp2Q4GkBKie29qDaFiz/6GoyE=; b=GbjUpg4ZGPRYIXKb4EuYY/etk4gHT1fl9rO+aJdm6F/cuz+3lEUMtpHWbwdu1bauv8 Vh4k0s90XwoCxlLkV8qtOMgbRsbVovVYX/GIMaFCIIbz6qaI9J3ExPfBPl3C8z7Dr2XP 1oL1YUr0sYRXNQrrhEH4UXe4DX/fpRKAGFtD9nXjivkk7xGXjMcArrPzw3tUprnc/9zO U1D3zr3x74znA6FCNj5nuA0WdQT1KJzQ72ywrwIqaCUrJt9+F8rHRK1CQ7a+TgrZPLDO 6OJgCKBLpAqz4le+45Ti1aKtZzel+o9g565sFxowbfZ/x5ZO8/uNGKZKyqJfqPQ2oBuu TlyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738113676; x=1738718476; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9cVwVFxMhNAc32HnWmNp2Q4GkBKie29qDaFiz/6GoyE=; b=eR6Fam67UmeRD6GmfVwwrMkz2qDpuo0JDsTpWYdzw6QHRPMIT93WGwnGW3PDpsfNSK IHGZhvSDPSoMyQ9W44DWmSLbRSbVBLjpZGowYOHg4Rxgd/zaDQNKFz7TgTXiHiy024Uy fvlxpSGWYUFBPUltGrrX/s/kyxCmtXrnbBIxpipLL6bP5HVVvyKxlVsiGiS9HxDjWX8b vC4eCrZSwXj8BICdjaZAu0V8dmhRz2tR9Q+RinQx091agjTIu2CTmldQYZtdtT625s/X 6DKjpG5VZ4Ni2RbmnPhD1yV0VR3NfM2xugcQIQo9j4o9TcnceiUQCgujcmDlL6F8bDEx L2KQ== X-Gm-Message-State: AOJu0YxXYZcSE7/pRfdifhKVgE+0BWNEZXj0Rnngj2K5aZww05LtkAvG 7Nj1iYFL3UXElcVB/+WKOk8eVHC0Y7h4AxuojpepWQHCjFkMK5OLyy44HQ== X-Gm-Gg: ASbGnct7v3NGOaVPL0Bz7YjlCU+kZz2AgM9QTWb8eLSCMMk2oruC67ao66sPyVYESZ8 vXX0N/yzFha+f2LItmLKtrSsuzKI7lKJE/dbyaMDBAD2Gjzc6eGTiCFUPX2SbDxqu9X9SkxJ4tm PinLhASy1q1lyrxGslj8EsRbNP9NJ2FkaTblb7/XVX6PNOMRyNkCEXtNBMTdP25rhKnsSfZLhBo de+u49PABw5xi7vK23qQITTCJ0Ce4EnH2tsSrk5YZB4ApVvt5H4XjlNwsvCalYJdKnz/PiEOx9o MoJVS1cWhRa4TZfzNIqPmBRK1vZ7ugFHeNO4n48D4mg7IinaLHbzrJvUUoGhaao7gfBRHt8FLN2 p15ZvK48xyBkBG6XhmEfteV0nG5I= X-Google-Smtp-Source: AGHT+IEOUyHVVNR/x6BIueOPAU7CoTy1sQxKRhhf8xdGVgVs+/j942qjSUotVQfGYIBg27nqRNTaNQ== X-Received: by 2002:a05:620a:24cc:b0:7b6:c6f8:1d29 with SMTP id af79cd13be357-7bffcd999a2mr188597785a.47.1738113676368; Tue, 28 Jan 2025 17:21:16 -0800 (PST) Received: from smtpclient.apple (wn-campus-nat-129-97-124-54.dynamic.uwaterloo.ca. [129.97.124.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7be9ae8ae18sm574175885a.38.2025.01.28.17.21.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2025 17:21:16 -0800 (PST) From: shenleban tongying Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Message-Id: Date: Tue, 28 Jan 2025 20:21:05 -0500 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3826.300.87.4.3) Subject: [FFmpeg-devel] [PATCH] avcodec/speexdec: limit max frame_size 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: The max frame_size for speex format is 32000 Hz * 20 ms / 1000 ms = 640 close #11054 and #11078 Signed-off-by: shenleban tongying --- libavcodec/speexdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index d25823ef6e..555012a343 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1425,7 +1425,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, if (s->frame_size < NB_FRAME_SIZE << (s->mode > 0) || s->frame_size > INT32_MAX >> (s->mode > 0)) return AVERROR_INVALIDDATA; - s->frame_size <<= (s->mode > 0); + s->frame_size = FFMIN(640, s->frame_size << (s->mode > 0)); 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".