From patchwork Thu Feb 4 19:09:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25416 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 5CA464480C6 for ; Thu, 4 Feb 2021 21:11:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49995680571; Thu, 4 Feb 2021 21:11:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 187E768AA7B for ; Thu, 4 Feb 2021 21:11:49 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id r20so3245396qtm.3 for ; Thu, 04 Feb 2021 11:11:49 -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=dA6jbKYnRDSkRZoimCdGzPbj5L1td8zxE0if6N7uoKY=; b=mVRPI3XyZZBR4eYMSKf1fCoX5UWp554zkai54RzIkS6xDpf7DpebGEvhrS9tUMyXGF 2wJHxIwbmLQvopc96XqVO6YDweRHy8VkG0RHEcfqQLLkuKkZb/3x35gYdU5hcO6oP+Nn Xv/b+HxbtCJfwA9r42Kxn5P7tCG3OrIN4uZigBeS9WcjH1M3MWEpYeGSsE2F/aB0LukD bONhA+naATqgCTb9E34biiLsh6V15RmX6N0HKJYEFVJSjj47hEdBO+94UvuHJammNNM5 WYGzStH/S94PXIxT35IvYEOC6NDqww88CpGkfuR5nYJDX0lQDeqvUQf36Dp6MGlDBzpd mF0Q== 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=dA6jbKYnRDSkRZoimCdGzPbj5L1td8zxE0if6N7uoKY=; b=exchmiXuDnJaM3cWRFFY092URmiw9xaNjcZQhPFWb0xFoPbSCZGphBINCkhL35wa6j N6u80LRMcT1oQKSLnEB2xcSmZU+tBDw6SNZ+XGWm2x2K2bQOn6Ri86VgMXoW/aSifbqm T3jZKIdfGXC+XQPXymSwAUZagriaKwLRPqPTF7SOXcgSIcYbTjKCotoCCLzrftGjdNjm DQvcTmmAR71Bz7eeRGAcertoKc8hNY6axGg0vplA9SCLGF+R61d6AHSjlIzvkRHQmPfA WKszUyMQ0p371dIzeJKgsbTHQIC5tSXDMiYWjAvSGeRpYH+KZND9J507Y+kk9PF2p0Uo wH/g== X-Gm-Message-State: AOAM531aCeOUaKtWWyFZYXe0cLNc5W0Nbxy1yt+/p6jVIBxezs8sJr7J 6jvG/ZRWP4UHx7c9VM7wkB2dpStVkc4= X-Google-Smtp-Source: ABdhPJw2QUfgWoyJq6xnE3OJwDsKiGU3RxWkmJRQoxP91JYcFdzbLMU4SrEa2QJvAY8HXTrx0/RJGA== X-Received: by 2002:ac8:768c:: with SMTP id g12mr1088773qtr.24.1612465908572; Thu, 04 Feb 2021 11:11:48 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:56 -0300 Message-Id: <20210204191005.48190-42-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 41/50] tools/target_bsf_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_bsf_fuzzer.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c index 8781a93ac3..bab809162a 100644 --- a/tools/target_bsf_fuzzer.c +++ b/tools/target_bsf_fuzzer.c @@ -42,7 +42,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { const uint8_t *last = data; const uint8_t *end = data + size; AVBSFContext *bsf = NULL; - AVPacket in, out; + AVPacket *in, *out; uint64_t keyframes = 0; uint64_t flushpattern = -1; int res; @@ -119,10 +119,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { return 0; // Failure of av_bsf_init() does not imply that a issue was found } - av_init_packet(&in); - av_init_packet(&out); - out.data = NULL; - out.size = 0; + in = av_packet_alloc(); + out = av_packet_alloc(); + if (!in || !out) + error("Failed memory allocation"); + while (data < end) { // Search for the TAG while (data + sizeof(fuzz_tag) < end) { @@ -133,11 +134,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (data + sizeof(fuzz_tag) > end) data = end; - res = av_new_packet(&in, data - last); + res = av_new_packet(in, data - last); if (res < 0) error("Failed memory allocation"); - memcpy(in.data, last, data - last); - in.flags = (keyframes & 1) * AV_PKT_FLAG_DISCARD + (!!(keyframes & 2)) * AV_PKT_FLAG_KEY; + memcpy(in->data, last, data - last); + in->flags = (keyframes & 1) * AV_PKT_FLAG_DISCARD + (!!(keyframes & 2)) * AV_PKT_FLAG_KEY; keyframes = (keyframes >> 2) + (keyframes<<62); data += sizeof(fuzz_tag); last = data; @@ -146,26 +147,28 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { av_bsf_flush(bsf); flushpattern = (flushpattern >> 3) + (flushpattern << 61); - while (in.size) { - res = av_bsf_send_packet(bsf, &in); + while (in->size) { + res = av_bsf_send_packet(bsf, in); if (res < 0 && res != AVERROR(EAGAIN)) break; - res = av_bsf_receive_packet(bsf, &out); + res = av_bsf_receive_packet(bsf, out); if (res < 0) break; - av_packet_unref(&out); + av_packet_unref(out); } - av_packet_unref(&in); + av_packet_unref(in); } res = av_bsf_send_packet(bsf, NULL); while (!res) { - res = av_bsf_receive_packet(bsf, &out); + res = av_bsf_receive_packet(bsf, out); if (res < 0) break; - av_packet_unref(&out); + av_packet_unref(out); } + av_packet_free(&in); + av_packet_free(&out); av_bsf_free(&bsf); return 0; }