From patchwork Fri Mar 25 23:06:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1471463uaj; Fri, 25 Mar 2022 16:07:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQvYAdDwUZoTZFI6BM18zbTsThAfSsNzgJeo/u1YZbuhchzgdR0Qp3B974s6FbroXSllwZ X-Received: by 2002:a17:907:72c5:b0:6d6:e749:da41 with SMTP id du5-20020a17090772c500b006d6e749da41mr14765235ejc.591.1648249647922; Fri, 25 Mar 2022 16:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648249647; cv=none; d=google.com; s=arc-20160816; b=IO71ejzG2iV8gH1WJ3evYQm/NxIJkku2bYcMlglFIZVNih8hG+ujzNgQR/PC9/frMA tJ7IDs+HJtk+UvRI2fzlja5nDhlyzDHKCzs7b5z7SxS6W3AGZbXjAlyONLs+ChBCpSSJ nAvtVGF1032zZnwG83KSYDdbez8YqYvkz3LragN+lFygDjv9j8a05/JHwyMq/7XPXJhh KwRSBiqi5VGPas1aQ6529VKpg3f/gz7kWEECeM6rF7NY1Gxqu2oSb1Cav1ycjBpgfVwS PGIHD1EUmGiykmFZj6iofTnxx0VHNqWVNVTXiL21TSqE/UxHJHaFoQcfxPnG3K3vtNi0 +55A== 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=Hj8h58ziyxr5/hwAl3Jb5kFSk4y1E+/ftswHOXFwi84=; b=g2wRlRZzijzP4fi2e4aDTrt7uAwZQ1uMn63Ig5ER/b9PZBWoIfqk5dhUIDXB82ffY7 a3mp7GkJSINQptLdYtBQ3rd9c/0uz/uJYjBMAcu5rqShToHz0cOi6Djg4XkMY77qTZVt hzbCyig626MjxvyiIgsdQ0/sL85IrX2UvRKCOGDRkNeJ0YjMQf3ZTVqvQ7ZpNw4jFji8 gEqDyLWOXhndbMDG0wFFMq5A7dACkcZtPSGj9Sm2nIfikf01xo1aHBfCJgxxyijiq4Dz lZgluwC+Wqock8DVfgyLb7LpBAxUr4m6F2ihjbaid9UefeznOdvMSjOSRkKL1j9YUo5n JGvw== 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 c26-20020a056402159a00b0041935da592fsi4052101edv.624.2022.03.25.16.07.27; Fri, 25 Mar 2022 16:07:27 -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 C31B468B1FB; Sat, 26 Mar 2022 01:07:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64B8F68B137 for ; Sat, 26 Mar 2022 01:07:13 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nXt1O-0005Kp-Fg for ffmpeg-devel@ffmpeg.org; Sat, 26 Mar 2022 00:07:06 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Xt17nuRoWSgGFXt1Onawpe; Sat, 26 Mar 2022 00:07:06 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id Xt18nK2oVOPqFXt18nNeOr; Sat, 26 Mar 2022 00:06:51 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=623e4b1a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=L5XN6A6nmI0XrU1vtBAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 26 Mar 2022 00:06:49 +0100 Message-Id: <20220325230650.29751-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfGuTmXNYqzLvTpe9+FOCgwCsqklYr5Gv3RxFlYaMzboY1jo662lmCUYflXDU0q+kx4O4Mntdyj2YNDsZ/4uJ3IGyeRea5/JiAQtliG/sJZuEKRjaCfD8 dcUGRojw6hL2E6H0xVQbvloCHedaUXn18clJwN0Fw6jteNdLFZrNN2lLDdt2k9XMyX6MQmuLMEjCLQ== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Non overflowing ambisonic order check 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: ERkUKiTMw6lj Fixes: signed integer overflow: 536870913 * 536870913 cannot be represented in type 'int' Fixes: 45862/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4730373768085504 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 6c847de164..3619be68f4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7382,7 +7382,7 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom) } channel_count = avio_rb32(pb); - if (channel_count != (ambisonic_order + 1) * (ambisonic_order + 1)) { + if (ambisonic_order < 0 || channel_count != (ambisonic_order + 1LL) * (ambisonic_order + 1LL)) { av_log(c->fc, AV_LOG_ERROR, "Invalid number of channels (%d / %d)\n", channel_count, ambisonic_order); From patchwork Fri Mar 25 23:06:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1471441uaj; Fri, 25 Mar 2022 16:07:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSmNUVHLHoxfGc+80qMCircxiLQZ7YrRMz6ie9/fm721Nyc1TaVm5YnzSPRJYuo8c0FEzS X-Received: by 2002:a17:907:8a0c:b0:6df:8b04:1a65 with SMTP id sc12-20020a1709078a0c00b006df8b041a65mr13912282ejc.331.1648249639647; Fri, 25 Mar 2022 16:07:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648249639; cv=none; d=google.com; s=arc-20160816; b=E3RgMB3zKjRrwyyCKSC4Yn6m3dKCaba9CO80rPKVYinsX/t37ZmYE24oBzPNIT0+hd ifNOUTkZpYUJIB0RSuHpK2700WZ07nB24VbqLcP2/1P3/CEWqHCiaIe0BUXDmlSxDmW8 dmbW9uMf4BQ/5CLwRjVDPb94PcokjvrOyMxsX3RN8OqLc4JQu8ljirYfUVavYZs6YZUx Ky6GiGCqnWnoDIfDlV1/FuP1eX+ZISG20GlksR7QHIXI2uNtUi1/8rQhiM582pR9b0m/ ZuVqMhVVl51gO8BOLwaWS3jddCUKFTELZiKr/V/Co23Yk+SwTI7hWz+xbo/0Kf2XYh2F iGnw== 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=TFZr712NKuM/F2zzHaxMZIQF7RTygju3pBgLp3erqkU=; b=zqQtEsI8507zSr+E65Vr+NXYbmyVNcV8hfES6HLw0RGz6qs4NUQydW++ZtXFStyMkL 6q9ZulsJLmO825Rdhr1l5eB/B1zvypcy+dgtyMTfWvWezlj/44kJ5zuih4Xu2HXJx5FC WBGW/4ATmv2zU8ZbneQxsRXqIZvfSgVRrxtRmwL5L4NMWtVjFxVO8SHTbbZ5JhacVsyo vxv+Gk0pYtq61onJJZihIpXruXF9RlSyY/ITRAzV2ufd4oYm8v1XAIFLFIEme8lm1QyE wLny/315rWX1jLaJpOIq6uV79Vn/mPeQ10lXSF1LduGZkPWJ1Nj3Z4IHql54UveIyVTI NXaA== 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 f2-20020a50e082000000b00418c2b5bedbsi4334400edl.445.2022.03.25.16.07.18; Fri, 25 Mar 2022 16:07:19 -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 D1D5E68B18C; Sat, 26 Mar 2022 01:07:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83CD268A6F6 for ; Sat, 26 Mar 2022 01:07:09 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nXt1O-004VZ6-Fh for ffmpeg-devel@ffmpeg.org; Sat, 26 Mar 2022 00:07:06 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Xt1OnuSAsSgGFXt1Onawpf; Sat, 26 Mar 2022 00:07:06 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id Xt19nK2orOPqFXt19nNeOt; Sat, 26 Mar 2022 00:06:51 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=623e4b1a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=XsGhC4NrRAVLJpa4:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=exXGB0KZHp8gcD6PieAA:9 a=o0zHZWiAoPVtIei5r5XJ:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 26 Mar 2022 00:06:50 +0100 Message-Id: <20220325230650.29751-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220325230650.29751-1-michael@niedermayer.cc> References: <20220325230650.29751-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGuTmXNYqzLvTpe9+FOCgwCsqklYr5Gv3RxFlYaMzboY1jo662lmCUYflXDU0q+kx4O4Mntdyj2YNDsZ/4uJ3IGyeRea5/JiAQtliG/sJZuEKRjaCfD8 dcUGRojw6hL2E6H0xVQbvloCHedaUXn18clJwN0Fw6jteNdLFZrNN2lLDdt2k9XMyX6MQmuLMEjCLQ== Subject: [FFmpeg-devel] [PATCH 2/2] avformat: Do not search through the AVOption table for a option not in it repeatedly on each packet 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: H2rCkwuRVjip This search takes alot of time especially when compared with small packets Signed-off-by: Michael Niedermayer --- libavformat/demux.c | 15 +++++++++------ libavformat/internal.h | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index ac1f16edcd..ef189d9d8e 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1407,12 +1407,15 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata); - if (metadata) { - s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; - av_dict_copy(&s->metadata, metadata, 0); - av_dict_free(&metadata); - av_opt_set_dict_val(s, "metadata", NULL, AV_OPT_SEARCH_CHILDREN); + if (!si->metafree) { + int metaret = av_opt_get_dict_val(s, "metadata", AV_OPT_SEARCH_CHILDREN, &metadata); + if (metadata) { + s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; + av_dict_copy(&s->metadata, metadata, 0); + av_dict_free(&metadata); + av_opt_set_dict_val(s, "metadata", NULL, AV_OPT_SEARCH_CHILDREN); + } + si->metafree = metaret == AVERROR_OPTION_NOT_FOUND; } if (s->debug & FF_FDEBUG_TS) diff --git a/libavformat/internal.h b/libavformat/internal.h index 342e6f7327..3ad76d992c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -183,6 +183,11 @@ typedef struct FFFormatContext { * Set if chapter ids are strictly monotonic. */ int chapter_ids_monotonic; + + /** + * Contexts and child contexts do not contain a metadata option + */ + int metafree; } FFFormatContext; static av_always_inline FFFormatContext *ffformatcontext(AVFormatContext *s)