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 ESMTP id CC11A48849 for ; Sat, 20 Jan 2024 01:47:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A56568D07E; Sat, 20 Jan 2024 03:47:51 +0200 (EET) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B53868CF92 for ; Sat, 20 Jan 2024 03:47:44 +0200 (EET) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6dbcfef55dcso64407b3a.1 for ; Fri, 19 Jan 2024 17:47:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705715261; x=1706320061; 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=vjuuHAesMGbTuHW3/CksUKL3hqCqQagD4byzI78P2T0=; b=UvI7x/sg14QPR1eRSlSr6qnUAzocdei/tb1M24fBwDTFaR4kVjiV0k5NIkGdU60ujJ l+HthHXmPdL6LfdE1xQydIt7s3jLtsC3BTDl4VvhWGUspqzrKymseDa2tU+6CvMnUZ6a FE78kCGcB+FV0AVEABmcCK6uGfqG/a79QuRTiza/CpGjW+xzpZObJ8ZrQBniuLs2pfH0 kNGTMF/7dliMitF7x+32bG4svbu6HPgCGwdGoKaH26yKnpa/9Xk3nDyHO3mJCiqJ+iBy dYXSBl1nJAdG0NJddCnNwWFLvNO/Q1+2q+DHjfEo9jnoA+NusycVMb3WwQ3RSyMOoJm7 Aidw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705715261; x=1706320061; 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=vjuuHAesMGbTuHW3/CksUKL3hqCqQagD4byzI78P2T0=; b=wRu0vB0EEFYY92PHmcyvvLeel4QprwA+HiR/Jrh9MpgGnbsV5N8LJCckGa+00vjxk0 7ftLNCHx3qmJJIsnZEmgdQR6IForNzf82Tfpcc9u4B1qi8BoVlATRZ7Un3tGy7xL1Qsp qPVb7O03c/Hw9JcCdVZ2SuJVoV4BQxptdIqmvTdc3lKqPYfl5RafMg3+ZpU2qb+AhO4k /f5arQq77baT1mw4lm5rbo1ja742PtfojFp1EsAVX6vdxODXnvEfGH9AGcGrF3jADzd3 lohe741X99KRfvaFO1vKH4ldx0ZkMWaR9cISxx08PMBsEAcW37DHSKtxip0x04sudRLa Njtg== X-Gm-Message-State: AOJu0YxBeN1Sm0u6eVaM9fAJEgaqpQcXz9wmLUBR0iCXvOYEaWgdLpxM uYeSMdPdgutlfUUqrLzoiJuCTbjzMLDSNUv4JMtu+0y4OrDYBWS0/KkfT1v7 X-Google-Smtp-Source: AGHT+IFsUwf33bmqrUAadfjWOq29UluXPnpRGRACG+Dcoq1yqS9RVg0E/9n0+zKLbf1MdXU3nfikbw== X-Received: by 2002:a05:6a20:631c:b0:199:9013:1980 with SMTP id h28-20020a056a20631c00b0019990131980mr744542pzf.58.1705715261500; Fri, 19 Jan 2024 17:47:41 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x23-20020a056a000bd700b006dbbdfb8226sm1840616pfu.1.2024.01.19.17.47.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 17:47:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jan 2024 22:47:29 -0300 Message-ID: <20240120014730.53635-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/speexdec: relax the extradata check for the speex string 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: There could be bogus bytes at the start, as is the case of vp5/potter512-400-partial.avi from the FATE suite, which could be a case of bad remuxing from an OGG source. Partially fixes decoding of vp5/potter512-400-partial.avi Signed-off-by: James Almer --- libavcodec/speexdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 08c7e77e7d..c73b2a7ec2 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -52,6 +52,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "libavutil/float_dsp.h" #include "avcodec.h" #include "bytestream.h" @@ -1397,9 +1398,9 @@ static int parse_speex_extradata(AVCodecContext *avctx, const uint8_t *extradata, int extradata_size) { SpeexContext *s = avctx->priv_data; - const uint8_t *buf = extradata; + const uint8_t *buf = av_strnstr(extradata, "Speex ", extradata_size); - if (memcmp(buf, "Speex ", 8)) + if (!buf) return AVERROR_INVALIDDATA; buf += 28; -- 2.43.0 _______________________________________________ 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".