From patchwork Fri Feb 7 13:48:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 17708 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 45FE044BA5B for ; Fri, 7 Feb 2020 15:49:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36D9D68B066; Fri, 7 Feb 2020 15:49:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 755F868B00A for ; Fri, 7 Feb 2020 15:49:33 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1j040j-00027w-0g for ffmpeg-devel@ffmpeg.org; Fri, 07 Feb 2020 14:49:33 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 03zkjDaY9wlys03zkj0CWZ; Fri, 07 Feb 2020 14:48:32 +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.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=t0ZZGeFCQuf886qKvUIA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 7 Feb 2020 14:48:27 +0100 Message-Id: <20200207134831.23137-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207134831.23137-1-michael@niedermayer.cc> References: <20200207134831.23137-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEuPDHN6RGX0WNsSr9b7cHFdz1IC4SZYwRnIywCoKuTUl6DRybBNVnZhsqbNx5YLSgFgOuxEyV7c6FS0rYeUF1dW8fcq/mCkwBcXvzpUdh75x9+HnxMG ILuH9OPjpILGyoDrTxKcFE0SUiFg/YEnU+bKnI7ggla+/56qRSq0r+Te Subject: [FFmpeg-devel] [PATCH 3/7] tools/target_dec_fuzzer: enable mjpeg for tiff or tdsc 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" This is needed for fuzzing tiff/tdsc and should increase coverage Signed-off-by: Michael Niedermayer --- libavcodec/allcodecs.c | 1 + tools/target_dec_fuzzer.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 0ad3338f9a..5735864702 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -795,6 +795,7 @@ extern AVCodec ff_vp9_qsv_encoder; // The iterate API is not usable with ossfuzz due to the excessive size of binaries created #if CONFIG_OSSFUZZ AVCodec * codec_list[] = { + NULL, NULL, NULL }; diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 67a2a41874..2e718c2e95 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -120,6 +120,12 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { codec_list[0] = &DECODER_SYMBOL(FFMPEG_DECODER); avcodec_register(&DECODER_SYMBOL(FFMPEG_DECODER)); +#if FFMPEG_DECODER == tiff || FFMPEG_DECODER == tdsc + extern AVCodec DECODER_SYMBOL(mjpeg); + codec_list[1] = &DECODER_SYMBOL(mjpeg); + avcodec_register(&DECODER_SYMBOL(mjpeg)); +#endif + c = &DECODER_SYMBOL(FFMPEG_DECODER); #else avcodec_register_all();