From patchwork Tue Feb 1 01:56:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp217991iov; Mon, 31 Jan 2022 17:58:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1mfQigh9SOla/9f17hAN0v2jHVIcjN3hgFT5VCQKREO4rsMTgM5kyHkuqh/IHljHv5mW6 X-Received: by 2002:a17:907:2ce4:: with SMTP id hz4mr18286708ejc.613.1643680682099; Mon, 31 Jan 2022 17:58:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643680682; cv=none; d=google.com; s=arc-20160816; b=gJWSJFMHjR+a91jCFKKMA1NThVi3zpkNgpHItN20Zzbtp2db8exLL4Hghh7Pl9tgPg o/DIMwskDSoKxLR5C6rZ9vwRar3J9bedm1/dGqSTs+br0gTRp7GoMnS8J8D08ENt493h 6JOJGx5yXQs6UTe+gHh39ImOjyE5QAbfseL2/+kabIigG1aqJUDFwSd3vJ77jEvJwTyv dI0oxfPO5gE7qzmS8yqkHmtu1Kayqp+fXkGTywM0riG6gmAs8ptkt/EUZQF4JAMI5h1B QZpNqgY9kPjqHkCnPRtMaxGP/u43x+9AYZTYjGDmptVVHOyVXr7z+d2uPnMKvHXckku2 YbyQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6En3kkaPmBgHY3Fwq+dmFCEXBfLOMo8hrx5qqFa6/UA=; b=gPxNG5WwVm5ah70HZVluVHF71hGuC9x4ImiWzMxFJfYUt8gpr2pUxqSc83jJbbDF5Z nnzcZhl+1F4cruiuFC0UPcOdDqxOAEFXCjMYNsrPv056cr8kOO9R5M2DxxP0dejCHM3c dvQhx2Wjlc82wOY7dWugXewokxJtGpX/1BuubRJR7dSqzzrGemXUHreqqIcyNdO4nL3Q fTxOsyQySP4JpE681i69y/ObnIjX1YpzWelmDIX36quFv068EVLq4JxAMTa0QU+gNvxJ rX56Mf0pupGLvVinAtxU6Ld1F9uH3DAr9K5+sZbr7dLUlyAfNZqqYOL3FrWoyYreC1Xj GjzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ozvkQofY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l9si7422867eds.288.2022.01.31.17.58.01; Mon, 31 Jan 2022 17:58:02 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=ozvkQofY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0854168B19A; Tue, 1 Feb 2022 03:57:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8A6768AFC9 for ; Tue, 1 Feb 2022 03:57:41 +0200 (EET) Received: by mail-ot1-f42.google.com with SMTP id i16-20020a056830011000b005a3cc8d20fbso8420330otp.9 for ; Mon, 31 Jan 2022 17:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nhcDujgBrFv68GjpKjkxlN4ECA0MK/dazOBMBP+rv7s=; b=ozvkQofYwvDqjfUHiDV1mksITwezonDcHFJ/jdhR/QMVAhvDuPyaBOZHcPUZ4ioPMy Dc71EjD+w3IqmouFdCcQxjuGt/zTNjZj1PzcDeLLaH5a3den37cGNUAJ4qimkepdM8lZ kXJcsC9M0H48y/O1t7HM6SeqPlbmD/md8C+Ul3JfbarDvGi1nIdNMpcBrIIimuZXgMRK XJhxu2CVUbHoc+5hR8EUCbdlWLBEqi6Ik2y6UzmJjAOxxznZ8KwJHFkntoyUYhuJ6viG MLLfHs/jq1ky5qAObuX8dkQaUp3PcXnnwLTDv7VC36IH4rnotsqmpgipXEIuEQAfszUB 5eEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nhcDujgBrFv68GjpKjkxlN4ECA0MK/dazOBMBP+rv7s=; b=kbc2C/UrBC2wSt6siCVcDqlEY5Jv3SkoDHJQwM32rblnN+75tRfgEE5WU7IlDPhwMg yluazkCZl6IGybqKTPt5rM349/MCq7i/LMV260a6UXmvkSV+UbKMF3ToS+PRz/kvjjDz B11umEzkJC2VdqDlQRcJBcNN84zVAjpPIXNBCsLYYbX2j08q8dWYvHKz0LrjjHwco/ee czttdRDEWCobSnk2YfuLT7Ol8qcxga+/Wd4uURoyHktPxWeZtTkara+J6hq77la852w+ v90e8yUf4ycKcHsc6858qvaz1Q5/jSpU03t/WKXxYUM84h4zHVObTa7Kvt3BjY7rGPQ7 Yv5g== X-Gm-Message-State: AOAM532G2JebU513DqvDQZWON7Ik/Z9G6Vcx3wNO50yIp2H3lVMU5lQL hdP6CRuL3SfEnPkXZC2DCQTOXQbAUwQ= X-Received: by 2002:a05:6830:1b62:: with SMTP id d2mr1890881ote.66.1643680660334; Mon, 31 Jan 2022 17:57:40 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id x1sm10811532oto.38.2022.01.31.17.57.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 17:57:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jan 2022 22:56:46 -0300 Message-Id: <20220201015648.2086-2-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201015648.2086-1-jamrial@gmail.com> References: <20220201015648.2086-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/decode: ignore unsupported skip samples packet side data values 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: Rktp5Pos4eyh Same as in the AV_FRAME_FLAG_DISCARD codepath, ensure avci->skip_samples is not negative. Signed-off-by: James Almer --- libavcodec/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 0912f86a14..4f9b949926 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -366,6 +366,7 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, side= av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size); if(side && side_size>=10) { avci->skip_samples = AV_RL32(side) * avci->skip_samples_multiplier; + avci->skip_samples = FFMAX(0, avci->skip_samples); discard_padding = AV_RL32(side + 4); av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n", avci->skip_samples, (int)discard_padding);