From patchwork Fri Mar 5 16:33:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26134 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 E1D8644B231 for ; Fri, 5 Mar 2021 18:36:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6AFC68AD91; Fri, 5 Mar 2021 18:36:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5CC268AA1F for ; Fri, 5 Mar 2021 18:36:17 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id s17so1259350qvr.12 for ; Fri, 05 Mar 2021 08:36:17 -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=6w4h0sKU3VSDiUQOxVUlr4LDk4pIgqnStBAEvs8qkCs=; b=HXFeSQ9Aw1JtRPVKf1ZJS2MeYVdhizdR+cvEGejA65TRuuY3GefAsDnhQFSR9AbTKf 86pZJk72cZGmP2kZZnMWRXRyHKV/gkHj4kjT30GO7hrXGSkaXuji0TOhWB6GftN1slCQ xZC0oovcP9uAkhn/6x9fIcjMsqkuWQFnbXgNn06KbKb+muDgKjzM1Rs6L0fQv9du5GoC n16bLjNrKXuL0MtaewUUVOnxfl+DhioaSZVXjQ5shOAmvPqu3bZLLkwULiyTkLm1BTKZ jedy5FFPxnGuDJMUUxYszW2LXraaNyv2wMxUe6XIvikefIMZIva+mzPlcZXAtUmIokhf lF1A== 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=6w4h0sKU3VSDiUQOxVUlr4LDk4pIgqnStBAEvs8qkCs=; b=bIa7u+DxSuQUf3FJIagkYwI3R+QjStUnKNB5A+Q/tavTf2fdFCdc3MNgeSV1p+0Ql3 anqOwidIbxGtjjBfJP/QDOsHT0ZHNATleGrqEKhScHVPOhDVn2rW21BpvQRddMEO5brC hSAEg2P0eKZkrBssLUieQkrPtKvjrwjcpsMU3t9bOn+ugERxciK026qAI18tJuVjysg0 ZXe9doyMpeAGluRNU5TAzZviXZyGbtBZttS7r7j1MWEygcLjMnG1+WnOAyESU6xDKekJ DEA4ElFOQV1pLunj8dS1RqwTkwOb7jMfFL80++WWUQbE2MrIzV0DampWmkIBcu6ajjIM U5RQ== X-Gm-Message-State: AOAM5327zqiO5l88THLs4We8DExrZJwTu2gUlGpCiO+4QB5CsxpsVxjx y0wlTdubiabQPyDQ87/LLNVf/3968s0mQw== X-Google-Smtp-Source: ABdhPJxGDBmwsh4L2n7FGg4VMrHHl4IsV/h9gFr80idatU4I6e9u7100Oclr1AAYTdANVXeQkEijew== X-Received: by 2002:a0c:c3cd:: with SMTP id p13mr2220529qvi.4.1614962176287; Fri, 05 Mar 2021 08:36:16 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:15 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:31 -0300 Message-Id: <20210305163339.63164-41-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 40/48] 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; }