From patchwork Fri Mar 5 16:33:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26156 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 4506144B46F for ; Fri, 5 Mar 2021 18:43:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12DBD68AD63; 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-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F55B68AD50 for ; Fri, 5 Mar 2021 18:36:16 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id h7so1287583qvm.2 for ; Fri, 05 Mar 2021 08:36:16 -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=krsKrQAPf4f1WsuySgy88zhxvLaj94N8TERqAjngTuw=; b=Zt8AnHwiSzrtHB+paEv7P9bHbU0fdTsiMtp9vZ12mnCyveP9ViPVM6GDKPbjM5e4+v q91iDQ5Xgaqckoc0KCgGQv1ucsXNdVV3LrjBKkoSFgzVNLa6o60NY33dH8UYeRxmhqxD 6SGZxCqNqezQbMsHGQYdrvPi3ZqH/a8WzLifaVGMMl8CHfZ+ROstAAGW7+6DLt+x/wt+ +NsjrHvYxG9xFNKCKWnqKUeNuKSJYs9PAQtImYy847DY3oRRn3U5oXUevYYOFvWKmZMP ASkTllJ+IrIsX2p9PH98hnzL6v+T/sS/jaN/hjvr5mMQ1Wbx5mGbqIrmyvYpzR/nrxNI zCDg== 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=krsKrQAPf4f1WsuySgy88zhxvLaj94N8TERqAjngTuw=; b=Y1nLaKWTz3CQIAGOKM4IEMc1CnB7Tu+FnvaXtaa9f1l6bh2G0kpakkDoH97hRPsXvN Ga3aPyy1St2t50en4zDsGd/1B+EZrOF3Wzonzw0Fk1idcaEBI7yAACO8Nde/DYnl/hU5 J7MtKx+gHceo2NTrjgSRYi93U7LdDT+pekgpsv76dJMG1rWfnKv/h1CkzrYroEtvYbg6 HAudzVjbwah4NStb5bQjyaMzlgksmlv3Q94gtrNG3UXNrJTG0VJXaLL3UR/oe3/BO+1i 4GNA9Wp9fl/ffyZBFjFG0PJvBf9nRYxOaDvM1hifExmMJTd5uzah+tsdh/OaYZMVmz73 7sVQ== X-Gm-Message-State: AOAM531GrZagKGLf5vM99fRy7hWtwMrugeK/+vjmslAfvFvx0ehpKPen 29zOSY5sGEFAK92kNNmeuJvAgIIgotRdBw== X-Google-Smtp-Source: ABdhPJyoIHWAl7IfE1JkGT78tqFSPTASD+JLrn3Jz3Q9ULUkSnc4R7XJsFIVfrC4HI96uLVUQhXJPw== X-Received: by 2002:a0c:c193:: with SMTP id n19mr9540949qvh.3.1614962174970; Fri, 05 Mar 2021 08:36:14 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:30 -0300 Message-Id: <20210305163339.63164-40-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 39/48] 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);