From patchwork Sun Aug 8 19:32:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2267116ioh; Sun, 8 Aug 2021 12:34:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrwDSvute4keSsxcQjlE1YqFsowTkcSysqI+MLNBkdNhzWtg5BojjvViuE+WaZy+hvwQr/ X-Received: by 2002:a17:906:9742:: with SMTP id o2mr19513543ejy.532.1628451253430; Sun, 08 Aug 2021 12:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628451253; cv=none; d=google.com; s=arc-20160816; b=xEZLCf411NrOt6eo9s7IrYFljz/l27n1jQ5CEvcLQv2GwJtdzyDQpC7ZjsDOjm0znf 1V2PKF5OZGfjgpfRnaEXWh8dQfCCmVtxbliIbNvJj10A6uGueXvTDTv3PO1j2pSDEuxb 7UDq+P3AQNbmEGZQqC186gRLciNaKUdgICfO8/x3s41YUBm8RKG/hkXQwyZ6Dy7T0OzC zxat42Oo7KESvtBk5gG7qgnIDlnEtZfplrUc8grCtVumJ6tynhkqUyBytU2/QckDmBxL O/lfLLeETx6sQKABRCu2aR15NjjaHyfNCTbaFnrG9sDd8YHXemoMZRjB1xnfcNo4An2R eBAg== 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=r3C00FoHDa5EAGEpsV+wRSYXQIiTfjOnnslcWHQfbTc=; b=QZMjD/szF60+gNCaU5mhtr7oMT5YrhZEQAk+YBg10P+Mf70wrAmyBNMwPJdwG3kKMm tzL1I8tV+wYfNTkZ/wqPGSXLFA0mXZaI2BmpB+FJYDOajbfMuiXzlJbvg8VDZHQScg6H Z7CVcQe4C3HRb8J/n215awyRKe9pti4r1M0lnjQZzoBTH7Y+bC/rrBV9KGHm9BBOz78o KHss2EqRXRI6p3pQdH9gS5fnnd1o1eaXMlXa5xCw4gJ1bAIRFC123pHrvtwWSss6e1RD VG6ZRA8DypD2MM9RSkKymH4ZNayvM63KQCGo656LjDHjMPn8hm5meu/c/V5JMA0sA5eH cscw== 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 g10si4213678ejb.419.2021.08.08.12.34.13; Sun, 08 Aug 2021 12:34:13 -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 8E93068A3BF; Sun, 8 Aug 2021 22:34:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE56068052C for ; Sun, 8 Aug 2021 22:33:52 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mCoYS-001zLY-0A for ffmpeg-devel@ffmpeg.org; Sun, 08 Aug 2021 21:33:52 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id CoXTmYDTvljeHCoXTm1ATM; Sun, 08 Aug 2021 21:32:52 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=vwEDrmZIgYAZZpsgw-gA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 8 Aug 2021 21:32:50 +0200 Message-Id: <20210808193251.6564-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKhvZ0N1B/Lkmo6+CFcn9z2E5YtYhaVjI/IoiWQanhoIQdb8x5fNWopnMaxtbbQg21zBzu38iT8Ev7PG1he7SzY0Rw5FHE10I5cgmp+myhByxj35tIli pqrIrIUEW6OTlL2+KirbIdACc5Dl+LAQsi6CfoDwkXAXU79NfG3gsxLF Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vc1dec: ff_print_debug_info() does not support WMV3 field_mode 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: vjcxQyp5+lmE Fixes: out of array read Fixes: 36331/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV3_fuzzer-5140494328922112.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vc1dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6cd74a09f1..070604d73a 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1149,12 +1149,14 @@ image: if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) goto err; - ff_print_debug_info(s, s->current_picture_ptr, pict); + if (!v->field_mode) + ff_print_debug_info(s, s->current_picture_ptr, pict); *got_frame = 1; } else if (s->last_picture_ptr) { if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) goto err; - ff_print_debug_info(s, s->last_picture_ptr, pict); + if (!v->field_mode) + ff_print_debug_info(s, s->last_picture_ptr, pict); *got_frame = 1; } } From patchwork Sun Aug 8 19:32:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2267055ioh; Sun, 8 Aug 2021 12:34:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFYOWpfIrzf4QKg0RWZTpnZ+ZQBtMN+CH6x5iNLQ7qvuDJmF+rho4ZX6uzN4w9rSK0jN+u X-Received: by 2002:a05:6402:4412:: with SMTP id y18mr25141966eda.1.1628451244591; Sun, 08 Aug 2021 12:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628451244; cv=none; d=google.com; s=arc-20160816; b=bKSS1FTq/soF34q/F/pyYe2/skRtrKAL29fd6umH7vJG6eJxXQNR3+AsMFbPbfLP0U x1G6Q3R0TQ24pTiD/dQsZdN4puH5ckFmXxKqApI4r0OdSxmCddiMQVu8uilmPbYxIp8S ERrRFlg8jQcNYx2NdkQrIpyycgHNDNEWnst+BBBNm39oN7eSZwXeyaZiRM7mwHstxy1W i8X/p1320gmpgwadGSIbYOTfWMkbG/3fSrW4K1XzLyN4qrjQrtQSw7OY2xkqey7BgydP 3R+3bjuSFkpc0CdpwoX3v57UBWfaMuJbxtlhAIr7DQiD05+kWTU5HGkFoCYEgXreqtn1 9T6A== 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=jRZydxnAaLwZ2wAvS0Md4fY3unnZOnZHAoVCiD+N1l4=; b=EFtPwQt/NFbM3Ypz7S6EpX7J5ofyx/VaYuTEzoEtH1meRuOTCq/UlQUeS0NhbyGWMZ xz3AoEg8exNd7xv423AoZpX8AljR8Y7FuBRupz5y3SIFjmL2vPgPvkG7tgaiNohOUYOr 1uW7a4T5xcQsUL+y+b/0JBKOpdiKVewAGFrrjiAB3wpbyoRlSe6AfITpFTW2OSwZveto X4JnRKrt5YSFl2VgYz8kE0EYK74UDrSvcdcOwzMHjErHuNyI6o3ZvC3HIm4lh0VhQ5PT 8T3zlZrBe05nOoTxFZ/aoKKJlAlNthSJuqOFHvWX8xUenyf4l9GYsZJU8PDX68M1PPW9 00iQ== 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 qk13si1496475ejc.661.2021.08.08.12.34.03; Sun, 08 Aug 2021 12:34:04 -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 4EBB368A3AD; Sun, 8 Aug 2021 22:34:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0C5A6899E0 for ; Sun, 8 Aug 2021 22:33:52 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mCoYS-00CCjV-08 for ffmpeg-devel@ffmpeg.org; Sun, 08 Aug 2021 21:33:52 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id CoXUmYDV9ljeHCoXUm1AU4; Sun, 08 Aug 2021 21:32:52 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=x1sq0kemxL05xfbrCoAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 8 Aug 2021 21:32:51 +0200 Message-Id: <20210808193251.6564-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210808193251.6564-1-michael@niedermayer.cc> References: <20210808193251.6564-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKhvZ0N1B/Lkmo6+CFcn9z2E5YtYhaVjI/IoiWQanhoIQdb8x5fNWopnMaxtbbQg21zBzu38iT8Ev7PG1he7SzY0Rw5FHE10I5cgmp+myhByxj35tIli pqrIrIUEW6OTlL2+KirbIdACc5Dl+LAQsi6CfoDwkXAXU79NfG3gsxLF Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/h264dec: use picture parameters in ff_print_debug_info2() 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: sct5u4hfhamc Fixes: out of array read Fixes: 36341/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6737583085322240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 38f8967265..07ff9110d2 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -914,7 +914,7 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g out->qscale_table, out->motion_val, NULL, - h->mb_width, h->mb_height, h->mb_stride, 1); + out->mb_width, out->mb_height, out->mb_stride, 1); } }