diff options
Diffstat (limited to 'tests/libfuzzer/gui/image/qimage/loadfromdata')
3 files changed, 8 insertions, 52 deletions
diff --git a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt index 5a573b21ce..9c97294077 100644 --- a/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt +++ b/tests/libfuzzer/gui/image/qimage/loadfromdata/CMakeLists.txt @@ -1,4 +1,7 @@ -cmake_minimum_required(VERSION 3.14) +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) project(loadfromdata LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -7,8 +10,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) qt_add_executable(loadfromdata main.cpp diff --git a/tests/libfuzzer/gui/image/qimage/loadfromdata/loadfromdata.pro b/tests/libfuzzer/gui/image/qimage/loadfromdata/loadfromdata.pro deleted file mode 100644 index 204bd6569d..0000000000 --- a/tests/libfuzzer/gui/image/qimage/loadfromdata/loadfromdata.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += gui -!isEmpty(QT.svg.name) { - QT += svg -} -QTPLUGIN *= qminimal -SOURCES += main.cpp -FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE) -isEmpty(FUZZ_ENGINE) { - QMAKE_LFLAGS += -fsanitize=fuzzer -} else { - LIBS += $$FUZZ_ENGINE -} diff --git a/tests/libfuzzer/gui/image/qimage/loadfromdata/main.cpp b/tests/libfuzzer/gui/image/qimage/loadfromdata/main.cpp index 54d1ed0ee6..951b8f4637 100644 --- a/tests/libfuzzer/gui/image/qimage/loadfromdata/main.cpp +++ b/tests/libfuzzer/gui/image/qimage/loadfromdata/main.cpp @@ -1,36 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QBuffer> #include <QGuiApplication> #include <QImage> -#include <QImageReader> -#include <QSize> #include <QtGlobal> // silence warnings @@ -44,12 +16,6 @@ extern "C" int LLVMFuzzerTestOneInput(const char *Data, size_t Size) { static char arg3[] = "minimal"; static char *argv[] = {arg1, arg2, arg3, nullptr}; static QGuiApplication qga(argc, argv); - QByteArray input(QByteArray::fromRawData(Data, Size)); - QBuffer buf(&input); - const QSize size = QImageReader(&buf).size(); - // Don't try to load huge valid images. - // They are justified in using huge memory. - if (!size.isValid() || uint64_t(size.width()) * size.height() < 64 * 1024 * 1024) - QImage().loadFromData(input); + QImage().loadFromData(QByteArray::fromRawData(Data, Size)); return 0; } |