From patchwork Sun Apr 16 22:25:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963390pzb; Sun, 16 Apr 2023 15:25:30 -0700 (PDT) X-Google-Smtp-Source: AKy350Zl9LWn9JTcsW4td7GIKotog7JyL+sXUDyKuW904wl1WEUsJ8is/gFhcgbpdyh+iBpdBkvu X-Received: by 2002:a17:907:91d5:b0:94f:39b4:e32c with SMTP id h21-20020a17090791d500b0094f39b4e32cmr3004178ejz.43.1681683930654; Sun, 16 Apr 2023 15:25:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683930; cv=none; d=google.com; s=arc-20160816; b=YHyot70NZXQCTYZli7/6+Mh8/lbWgjjkLgJ+wvjtYSYDK+StmjeBYjWd+RVzmyfi3S gHZz9FZnQZa/wG+HEneuHFAyqu4OoCM39YrQrlXCsQNINilSyU2ZYr08pZjffLnowQ7r KZeLe4krPfx0yDipcsqvoXmZXQ34jyMyjyJrBfBy8dE8fStEDRoQjsvBknPIgv3khnxh mDddxKk0dAbnWKoBMAr57ftKxDcrEgYDahT0tgT3ReCjnayFANxNcIKgPiGEXRmeBTSZ TdQgzinWCEWQbX/Ce2zi2/0zQFM6c31OwJcYjWkZXHjO2SqWuWNkb3opIQCHake6BgUI om9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=8K4WhICVtYRJQ6ugdTM2SRPfcjgau+plLQElIwtwvA8=; b=majRE7mGm7QvWMZrEPZlIjd3AP3zVUTtEl4zPLa+dHsSUQ1Ii3v8xL7yxYtcXNrXaK D0UjhBmdMlD2f08kLsYrQHKsX9/eycCnf+4tKV8bRRsP/xH6qpYyJZVsOcV0wmqTujhM /0RfRIKU2CIkgKKugeE/KwlqXZ/gv/MPXdHgV1PmzMXTtJh02+KZ7IDD07/pCiKvzBaI XjPTXINqzEaRxm+5La2kd8sna7TfyLx391e+9spJ2D8sJg+dkXYCwTC4Nq2cWN3s4cZ6 Jt1miINj+Nvpq5oQzymh0E8zACfwZFGdwSEZzS3t668LaGO65bKdwkDKQkxtSLo6h1wi Z9lQ== ARC-Authentication-Results: i=1; mx.google.com; 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 j26-20020aa7ca5a000000b0050697ff056asi2998763edt.96.2023.04.16.15.25.30; Sun, 16 Apr 2023 15:25:30 -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; 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 BC8A268BDF4; Mon, 17 Apr 2023 01:25:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3EFC6802C8 for ; Mon, 17 Apr 2023 01:25:19 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 4B78A1BF203 for ; Sun, 16 Apr 2023 22:25:19 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:14 +0200 Message-Id: <20230416222518.21308-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/pcm_rechunk_bsf: unref packet before putting a new one in 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zIxiM74llpRJ Fixes: memleak Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_BSF_PCM_RECHUNK_fuzzer-5562089618407424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/pcm_rechunk_bsf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c index 108d9e90b99..3f43934fe9a 100644 --- a/libavcodec/pcm_rechunk_bsf.c +++ b/libavcodec/pcm_rechunk_bsf.c @@ -153,6 +153,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) } } + av_packet_unref(s->in_pkt); ret = ff_bsf_get_packet_ref(ctx, s->in_pkt); if (ret == AVERROR_EOF && s->out_pkt->size) { if (s->pad) { From patchwork Sun Apr 16 22:25:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963410pzb; Sun, 16 Apr 2023 15:25:39 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpOGbHYCyiiXS8yzeFLJ7UVKJPAjVKfoAdZHAs/ZpGemH19hpBn/qZ9QE+J1WgtnJMKncB X-Received: by 2002:a50:ee95:0:b0:506:9495:9b5f with SMTP id f21-20020a50ee95000000b0050694959b5fmr4630300edr.38.1681683938859; Sun, 16 Apr 2023 15:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683938; cv=none; d=google.com; s=arc-20160816; b=ll6g2+tctqwNs1HvsEo/Ia+UOnYhhVMpaXuzc1rJoNCFReTuudeCXMCORYadUwGK6i 0EXBs4670mdMiHywbJeIvdXOBqvPX+WqOxrZ9uIz8XWUBXhdqoFZm1P/Cy+WQ8WMVihX j5CGvCuvjADhAYgRin/rUjoY5Du31uJEJ40yanHMW5q7MqbVaMZNfFeS8j7TQoZc6YkZ K896uaVu6qUIvwSThZhf3VdzUmnbLSmkQ9mqyJp9u2JBAUG9DQI1PqLzEHqQsbF9a2zl TpLAlJHL7Imhpqx2ERBU2P3PX/1AlPnHjJ18Ml8xea/RA2Iz73VxiUyhU76u6iZfjE2I OcCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=KgJdx5QIE/bty58AlWj2VBNzUZwWO9UoNpt5+LuGRcI=; b=gJpaAmapnHUrYzSzv85MK4MBP0OyoqSUI9zk/TWodxgRoTYrewS1CfW0bYD1hh5zLy ZTJfcG3CFfBhXHJNhh5tiAwxdoTmivQJJKaxF66qgf0rn5M7rjtCW50/SF3royrSQONK ELrPFQ8s7WMDIkKYGOZZOW1D7rT9a1jhE95VO5THlmWZKhHPWjCUSIffywxHtWlRLDo4 AIttYT+COjhBHFYqp9o4tOsRJPdOa7JZa+EgKE6e2jpRGLz8ecMgSjrFdxxSVsSdM5KT DS0PY/07oymCVLw/2tyjBsAOW4hxsgdQb1Wad4/cKt1MOfCYH5LASoCU5VXmVYIH+aEK XPMA== ARC-Authentication-Results: i=1; mx.google.com; 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 v8-20020aa7d808000000b00506a7b4efacsi533374edq.414.2023.04.16.15.25.38; Sun, 16 Apr 2023 15:25:38 -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; 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 D65C96802C8; Mon, 17 Apr 2023 01:25:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 553FA6802C8 for ; Mon, 17 Apr 2023 01:25:21 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 5EE4EFF807 for ; Sun, 16 Apr 2023 22:25:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:15 +0200 Message-Id: <20230416222518.21308-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/avs: unref packet after avs_read_audio_packet() fail 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WFn2R0/rjSgS Fixes: memleak Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_dem_AVS_fuzzer-6738814988320768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/avs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/avs.c b/libavformat/avs.c index ab47980a11c..2ce8b19c412 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -156,9 +156,11 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) uint8_t palette[4 + 3 * 256]; int ret; - if (avs->remaining_audio_size > 0) + if (avs->remaining_audio_size > 0) { if (avs_read_audio_packet(s, pkt) > 0) return 0; + av_packet_unref(pkt); + } while (1) { if (avs->remaining_frame_size <= 0) { From patchwork Sun Apr 16 22:25:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963444pzb; Sun, 16 Apr 2023 15:25:47 -0700 (PDT) X-Google-Smtp-Source: AKy350ZwxDwTkHBXTHeooGbM1FH08HnCSQGrJ4Tbm4OK21zvRqfVZu7Q8ZmdeCU1OsQ3l+JPvu64 X-Received: by 2002:a17:906:6091:b0:94c:93e4:b0c with SMTP id t17-20020a170906609100b0094c93e40b0cmr5902570ejj.76.1681683946946; Sun, 16 Apr 2023 15:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683946; cv=none; d=google.com; s=arc-20160816; b=cUsl9CGgLi4D/ALWW6tyjaQ2hDBRN2LXeqjsz2N5YGPANU59PB2CesaKXege42KLSV E1k5ritXgzV47vtJEw8YWpACyDEF5i/uL6Hx+0oMONQO0aPvTAdyP2c138K9cmM7JKh+ EQua0GXW/A7cev+TnKvYhNKxVv6Oi6PZyl9c2LnCTDYqHYNVzg7Pe80nVq0fUmjX+mF3 OAzn7bAqLUfgnFuYx7uFmBXIzY9aAieTdthNABvIZrtNEECkyoIYkx+pdfeB9KJdOyWW akpGswToXJHAZOAaTOhTvo4NaQjI+WpC1/wS2yIv7v8FTWBwjqFxQsnCMJ3JxPUyMy49 V6cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=nsAOGf3k96OU2TPWwOLQDnuXyZ1p/rMjNGru8qlb4JM=; b=XhQ6DVGPk7NWs474faaVdxOC9r4jNiutgi6mBIICIfkM0jitFsDznv9xoI48ty4qwK HFiLupNvjwCx0wBaUNOlUbLvnWqHefm4GYf3FEc/GKjxL6zyjN6zaGNXcminRlyOzQvn c/avjcRopdt2kgfpWrQcmsjUkVyVPM2MG0CXHzq02bexumjWmR/Yyr/onYUsxyrZpdbx t7fwTqXhdzF2GWISUVYg+HtFESOjP1At0DmVn4j/NTrSYG7qZB6qsIygIZXZBG/i6Y1e Mc4bHhLludbUjjfJemgnltYlpEaWl0gJNkV7zdnaD2MKWt5JmHI4f/ibkuRcVYDHB7Jm 2wew== ARC-Authentication-Results: i=1; mx.google.com; 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 ep13-20020a1709069b4d00b0094f5befc4b2si1768201ejc.321.2023.04.16.15.25.46; Sun, 16 Apr 2023 15:25:46 -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; 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 0178168BE2E; Mon, 17 Apr 2023 01:25:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE1C468BDFF for ; Mon, 17 Apr 2023 01:25:21 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 37274FF809 for ; Sun, 16 Apr 2023 22:25:20 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:16 +0200 Message-Id: <20230416222518.21308-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mov: Better check for duplicate iloc 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u9GTNBc9FA9i Fixes: memleak Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6674082962997248 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 057fd872b10..6853bb324cf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7777,7 +7777,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - if (c->fc->nb_streams) { + if (c->fc->nb_streams || c->avif_info) { av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); return 0; } From patchwork Sun Apr 16 22:25:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963490pzb; Sun, 16 Apr 2023 15:25:55 -0700 (PDT) X-Google-Smtp-Source: AKy350aCcOxXTLE74k30cp94wiSDiAx9Agg/7TtCkgAX4SMw5ULvCJmeM98vYfvVHoJNBvD+cGsJ X-Received: by 2002:a17:907:9010:b0:94e:bc04:1e19 with SMTP id ay16-20020a170907901000b0094ebc041e19mr4037068ejc.71.1681683955063; Sun, 16 Apr 2023 15:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683955; cv=none; d=google.com; s=arc-20160816; b=x5Akg/TDl1FwiN2dDYei75IlLKOPNS5liw5yWTwSdALYIvo5K2HIzts2wWMdR8T/5+ 3waqwOl3vZzhggLUQWKxLkj0ryy0awy4iTrucOP7vCZ1TWReE/cvH+gsUCZDh64PFvUw qcVi6oZtpfLqAKEEKvi3qPpVSLbbCoFtJ45qd8Q7vBOQ7plBa9gi9pL0gDVq8l1n4Cif A8kDM3hibWlPK76IeIl9o6x7hYKesyEjb+3/E9DESl5wNxheoVHBw7OoRRXkc8zyM66v X8idwcnReAg/ISPW//7vfmtsvXH6E+muTzsiy9v96/cD6re9pel5aiGhq6Kg/+leHvsV 8aXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=su54P9THDv7J4PaZS5bMhXCqfc+3miwGHp5OAvTESvU=; b=qP6q2CG8LSXWI4rJyo78kQ4Qo+9XzbA/urqpEnaUFFzxRO6DKxcotAGVhqdy2VZM9k D0a36G7NUu+3fyNKdEq0P8PrVMZEHsfzScbYpKyIrAfsOxvZsUK0ptM1Dfvj0SvbKNHz rC31Xg0UZCqGzQoXVXqGRqDSWcm+o3bujDA3Ah8JbcDiGyBQX6hfACug4/plTfyT804C jIp9onz2uJZAPhOdrHpRHWhU7VRi05zp1gGlG4jKUH6DUSgDR95lvJ7qsGeZYsCmkJjc naTkPYUORf77a5ttvDe8LmBW9H011nXGcG91JkDwqBpRq1innks9ILtdgJLsU574kdkR Zxog== ARC-Authentication-Results: i=1; mx.google.com; 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 vl12-20020a17090730cc00b0094f62f69fccsi1553373ejb.645.2023.04.16.15.25.54; Sun, 16 Apr 2023 15:25:55 -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; 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 0ED8F68BE3F; Mon, 17 Apr 2023 01:25:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1EA368BE23 for ; Mon, 17 Apr 2023 01:25:23 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E2D98E0004 for ; Sun, 16 Apr 2023 22:25:22 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:17 +0200 Message-Id: <20230416222518.21308-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/hevc_ps: Use get_ue_golomb() instead of get_ue_golomb_long() for depth 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tlcZun02QctW Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index be1d668c263..2f505ba2f7a 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1542,9 +1542,9 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, if (pps->pps_palette_predictor_initializers_present_flag = get_bits1(gb)) { if ((pps->pps_num_palette_predictor_initializers = get_ue_golomb_long(gb)) > 0) { pps->monochrome_palette_flag = get_bits1(gb); - pps->luma_bit_depth_entry_minus8 = get_ue_golomb_long(gb); + pps->luma_bit_depth_entry_minus8 = get_ue_golomb(gb); if (!pps->monochrome_palette_flag) - pps->chroma_bit_depth_entry_minus8 = get_ue_golomb_long(gb); + pps->chroma_bit_depth_entry_minus8 = get_ue_golomb(gb); num_comps = pps->monochrome_palette_flag ? 1 : 3; for (int comp = 0; comp < num_comps; comp++) for (int i = 0; i < pps->pps_num_palette_predictor_initializers; i++) From patchwork Sun Apr 16 22:25:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1963529pzb; Sun, 16 Apr 2023 15:26:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aCWpf0XwQHhhpOOJvwtJnW/Y1Bj2Gun7sLnTDGdaX3e0sFolZcgcaqqrWVnUrJDhqZiH9N X-Received: by 2002:a17:906:3495:b0:94e:8aeb:f8f3 with SMTP id g21-20020a170906349500b0094e8aebf8f3mr5195857ejb.57.1681683963894; Sun, 16 Apr 2023 15:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681683963; cv=none; d=google.com; s=arc-20160816; b=v/lTnUWVDpE4BkO3uvODXs42AQVSnAkPlUIRB5nY3xvn8WaQOWq+GvzPQmuT1wc+dU kDjHT6eSwaQFWGCTZ+1h+/hPldy89PdiX11AbrPxyxpc7yrmLMmhR/2hbiVIukLXWkZj 8SmLEynTNrP3XAsp0gs/7YvOd/B+JSWDeRDgL12uWzFXbSY7IoPg2KtqOUE4ZfPdQcJz sPYH6Qm4KdSGLExUZVQHRfQ7YPNyXEKvhJu1jiYP0wVseHYUj5ldrunUh4km3o6MS+up MKVAPj7a9C8xa65K3RP09+q3wa/Q3hlKOOIwni1ikx2GTz2fDiAxCLTkSujnuBK60E2c 4JXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=foiZfqi/Vg5T23OV8DDElI+Jjm1KW7CWg8wJCp1POI4=; b=lhhRfRvzknCnArfLeuTrCm/qz7TzqFxkWa4ClDexr/71++fHih1Qcs3cjwPYugXXqc 0gGXfqQATbpWLPpCbVZkqolkXybP9oGAwnqbmjAloBDj8kIZ0lIh+4QmG695TKWTPRxT q6yYjx+5mNJSqTkOWwNNBnXFExwBkC+PuF5MUkyg745fIsWDyKVdpU+ROe9E0Q5mlPqY SxJrMxJtf3kkgePFV5G+d570OnEvTf2KbVQUh+d41xNPq4uXb+NTAWS2YPC6j5Um2XVs 4cFaIeYoCMJW0g92WFQ6AonDvst5L01WzqwlmdNMQ89EABfvPUaXz6ptaIp08JabyuVh 1ndA== ARC-Authentication-Results: i=1; mx.google.com; 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 we16-20020a170907235000b0094f59407d46si1362387ejb.522.2023.04.16.15.26.03; Sun, 16 Apr 2023 15:26:03 -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; 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 1F8B768BE10; Mon, 17 Apr 2023 01:25:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC03968BE2E for ; Mon, 17 Apr 2023 01:25:24 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0830560004 for ; Sun, 16 Apr 2023 22:25:23 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Apr 2023 00:25:18 +0200 Message-Id: <20230416222518.21308-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230416222518.21308-1-michael@niedermayer.cc> References: <20230416222518.21308-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevc_ps: Check depth to be within 8 to 16 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9EDaXe/9DhYu Fixes: assertion failure in bitreader Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-627318668066816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 2f505ba2f7a..d8664ebda7b 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1545,6 +1545,10 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, pps->luma_bit_depth_entry_minus8 = get_ue_golomb(gb); if (!pps->monochrome_palette_flag) pps->chroma_bit_depth_entry_minus8 = get_ue_golomb(gb); + + if (pps->chroma_bit_depth_entry_minus8 > 8 || pps->chroma_bit_depth_entry_minus8 > 8) + return AVERROR_INVALIDDATA; + num_comps = pps->monochrome_palette_flag ? 1 : 3; for (int comp = 0; comp < num_comps; comp++) for (int i = 0; i < pps->pps_num_palette_predictor_initializers; i++)