From patchwork Mon May 14 11:14:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8950 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp3934093jad; Mon, 14 May 2018 04:15:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpP6y9vRkzHiHGedQmnIKmN3BHtFrRT11+kaLTdIVrYfBqvJ6C8eEndQHwqo3mmEul1V3b9 X-Received: by 2002:adf:c412:: with SMTP id v18-v6mr7143188wrf.20.1526296550651; Mon, 14 May 2018 04:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526296550; cv=none; d=google.com; s=arc-20160816; b=x70YnutDWd4NSlg+S7dKSP/LwkK5G/Dv/U49Je6jMwcJH1JQSluuyrF10oQJDs5nVb m6iyjeCL9ZdCJ7kN7udBAfnwmbw6w8xXFZnJXaN7AdhoPsCXN8CktTVgar+QzosQWcCl Ku5ehrXM2eQkM3fER9D64hh30LbUj0izN8cRSPQwGXdTb2NFvgAtUy0Y4g+SLT6aRE1a drb1RgjY39lL53pMq7kQjAk6yNzChdi94xosUmsUUClTUUIbAuPNUcVCj9CS4fQUo6Zc CmMVY3sv1blvg8zgEUcA2GuxZOeJXtAoEQMq3yqqAzqjBYuGY2CZWIAeZ5EoGAXoo4AB Is+Q== 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 :arc-authentication-results; bh=bb5A2xkDCN0OARpZL3hg7CdwnNOwdHsyfiOK4aWE2kw=; b=NYsGGT42mmx+0+x8YApt840UkIBCEW5KO6yOLF+aaDi01PUb/11/6TSI1zInIMM3ev H4t7IRotyavRvsg1pkqhhwGaYy4C9E7GGy52S4SZvvRJ0UTk2J6w9wUeJYQx9Q6Z44E5 4vmSCBpfLtMn9ezC3A8i3cLSx9/wFd+S1x30HgQVgtnwJvsEwf2jZhHz2EwuvtBbC9Lv 8ylGQXWunSpPkT4WgXTveA/AfAKAPYz0LLK4rU96gJA2WPFD1eSMsYRWU8Nc27yyDQDD O13pSIXoOaTqum1ubot/76Bf/p/cVePJ7vDbYwQgKDi8KHUUdOJEplsbLXmkC/I3Zcxb YmMA== 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 b82-v6si5091802wmc.65.2018.05.14.04.15.49; Mon, 14 May 2018 04:15:50 -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 3A017689FB7; Mon, 14 May 2018 14:15:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A561F689F10 for ; Mon, 14 May 2018 14:15:08 +0300 (EEST) Received: from [172.31.218.43] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fIBSD-0006MX-P6 for ffmpeg-devel@ffmpeg.org; Mon, 14 May 2018 13:15:45 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fIBS8-0004Ob-2n for ffmpeg-devel@ffmpeg.org; Mon, 14 May 2018 13:15:40 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id mBFU1x07R0S5wYM01BFVmY; Mon, 14 May 2018 13:15:30 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 14 May 2018 13:14:01 +0200 Message-Id: <20180514111401.6672-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] avcodec: Disable new iterate API for ossfuzz X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" A few days ago ossfuzz stoped testing new FFmpeg as it run out of diskspacee https://oss-fuzz-build-logs.storage.googleapis.com/index.html An alternative would be to revert the API. This changes for example -rwxr-x--- 1 michael michael 144803654 May 14 12:54 tools/target_dec_ac3_fixed_fuzzer* to -rwxr-x--- 1 michael michael 30333852 May 14 12:51 tools/target_dec_ac3_fixed_fuzzer* Which should massively decrease space requirements Signed-off-by: Michael Niedermayer --- libavcodec/allcodecs.c | 5 +++++ tools/target_dec_fuzzer.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 102d99b7ea..7b7a8c71ff 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -760,7 +760,12 @@ extern AVCodec ff_vp9_cuvid_decoder; extern AVCodec ff_vp9_mediacodec_decoder; extern AVCodec ff_vp9_vaapi_encoder; +// The iterate API is not usable with ossfuzz due to the excessive size of binaries created +#if CONFIG_OSSFUZZ +extern AVCodec * codec_list[]; +#else #include "libavcodec/codec_list.c" +#endif static AVOnce av_codec_static_init = AV_ONCE_INIT; static void av_codec_init_static(void) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 62d62a9de3..26a4cc2e89 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -56,6 +56,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); +AVCodec * codec_list[] = { + NULL, + NULL +}; + static void error(const char *err) { fprintf(stderr, "%s", err); @@ -144,6 +149,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { #define DECODER_SYMBOL0(CODEC) ff_##CODEC##_decoder #define DECODER_SYMBOL(CODEC) DECODER_SYMBOL0(CODEC) extern AVCodec DECODER_SYMBOL(FFMPEG_DECODER); + codec_list[0] = &DECODER_SYMBOL(FFMPEG_DECODER); avcodec_register(&DECODER_SYMBOL(FFMPEG_DECODER)); c = &DECODER_SYMBOL(FFMPEG_DECODER);