From patchwork Thu Feb 4 19:09:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25415 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 615584480C6 for ; Thu, 4 Feb 2021 21:11:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A3C268AA89; Thu, 4 Feb 2021 21:11:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C452968AA85 for ; Thu, 4 Feb 2021 21:11:48 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id t126so1900404qke.11 for ; Thu, 04 Feb 2021 11:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=/rS1oiccLKZBxyhq8yft8mnPApNxToxDIFHzp9m8zsg=; b=kKagrYEANs7/fAOgQ3SLfaXakCjhv8WMH2VJ937+eq4FAwaoiIm4PqT95zPlvD98pa w+n3g1qczYXcKTQSPwbShKki1j4VcVOzds88JSUpQigS7XbbPp5IdB0j8Ln+tCHXZ/Vu 4JS0nmTb5KU1mVYvAtCXBJHPtLSeoSrYQmF7N1QBXhG8fixvwtfGifn6JWfwpuw/L8mS qrb+cQPwz15Vf6TvOkR34OsZirmCxWiynrmoJ2WAhs4YtLvbtGD+5Wbcz3+deE4eQNe2 2yB5vmPb7h9V4EyLBdZ0who0t8gCMXcfOIuSuB0kTPKOhXDCWmoIW+KfsAsdUAV2BiJ1 3lVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/rS1oiccLKZBxyhq8yft8mnPApNxToxDIFHzp9m8zsg=; b=hqIvcNlHelKieuP7ek2PWFVfm07qZi13D5ajR+GAAt5GqJZrTn/QlVfW5+YlXCscQc KsShBh26ptr8PciYn0MKtJVyDVbsrY8JxXq4BklVpjfJeXqyvWHzwbu1CzXVLP8oSOGr /01rKE1fnoDauPCkcIfOsj0AxpFHb0VMShEAmgtTmtJxp8Ob4/LwyfwHJepvqQ+psULa dx7NWFT3g2tDAAvE0oNSpAZF+2TDQb9l8FQy4voQCSdbAAllXKdzrhBlT5uhGD846Td6 Sqx2FZbScXOow1SnRC0owIgpZO53XYvqXWJBJvgKLCIzK6pMuxwEfWK3+i1p5Q9rby/I qCXw== X-Gm-Message-State: AOAM530lG38fQW6+EvPVQYZBiTtIBFR52qvcSbEpv20oqSPxA+RpcluU l+hFJKDQAOzvqVhv7VSIcltkYN7qGCY= X-Google-Smtp-Source: ABdhPJyfzXQWJE08CTmsPYX+ABhX5i8YWCFJXCK5MQZhr0VhffnG5vIBynDe/Mw0fXa5403m+aVKcQ== X-Received: by 2002:a37:b204:: with SMTP id b4mr676955qkf.72.1612465907173; Thu, 04 Feb 2021 11:11:47 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:46 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:55 -0300 Message-Id: <20210204191005.48190-41-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 40/50] tools/target_dem_fuzzer: use av_packet_alloc() to allocate packets 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- tools/target_dem_fuzzer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c index 8ff98af945..af1840b359 100644 --- a/tools/target_dem_fuzzer.c +++ b/tools/target_dem_fuzzer.c @@ -96,7 +96,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { const uint64_t fuzz_tag = FUZZ_TAG; uint32_t it = 0; AVFormatContext *avfmt = avformat_alloc_context(); - AVPacket pkt; + AVPacket *pkt; char filename[1025] = {0}; AVIOContext *fuzzed_pb = NULL; uint8_t *io_buffer; @@ -165,6 +165,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (!io_buffer_size || size / io_buffer_size > maxblocks) io_buffer_size = size; + pkt = av_packet_alloc(); + if (!pkt) + error("Failed to allocate pkt"); + io_buffer = av_malloc(io_buffer_size); if (!io_buffer) error("Failed to allocate io_buffer"); @@ -190,17 +194,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ret = avformat_find_stream_info(avfmt, NULL); - av_init_packet(&pkt); - //TODO, test seeking for(it = 0; it < maxiteration; it++) { - ret = av_read_frame(avfmt, &pkt); + ret = av_read_frame(avfmt, pkt); if (ret < 0) break; - av_packet_unref(&pkt); + av_packet_unref(pkt); } + av_packet_free(&pkt); av_freep(&fuzzed_pb->buffer); avio_context_free(&fuzzed_pb); avformat_close_input(&avfmt);