From 16f504a9dca3fe3b70568f67b7d41241ae485288 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 18:49:04 +0200 Subject: Adding upstream version 7.0.6-dfsg. Signed-off-by: Daniel Baumann --- include/iprt/sanitized/intrin.h | 62 +++++++++++++++++++++++++++++++++++++++++ include/iprt/sanitized/iterator | 60 +++++++++++++++++++++++++++++++++++++++ include/iprt/sanitized/sstream | 62 +++++++++++++++++++++++++++++++++++++++++ include/iprt/sanitized/string | 61 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 245 insertions(+) create mode 100644 include/iprt/sanitized/intrin.h create mode 100644 include/iprt/sanitized/iterator create mode 100644 include/iprt/sanitized/sstream create mode 100644 include/iprt/sanitized/string (limited to 'include/iprt/sanitized') diff --git a/include/iprt/sanitized/intrin.h b/include/iprt/sanitized/intrin.h new file mode 100644 index 00000000..39b5ad32 --- /dev/null +++ b/include/iprt/sanitized/intrin.h @@ -0,0 +1,62 @@ +/** @file + * Safe way to include intrin.h from VC++. + */ + +/* + * Copyright (C) 2020-2022 Oracle and/or its affiliates. + * + * This file is part of VirtualBox base platform packages, as + * available from https://www.virtualbox.org. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, in version 3 of the + * License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included + * in the VirtualBox distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0 + */ + +#ifndef IPRT_INCLUDED_sanitized_intrin_h +#define IPRT_INCLUDED_sanitized_intrin_h +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4668) /* Several incorrect __cplusplus uses. */ +# pragma warning(disable:4255) /* Incorrect __slwpcb prototype. */ +#endif + +/* This is a hack to avoid dragging in malloc.h from UCRT. */ +#if (defined(IPRT_NO_CRT) || defined(RT_OS_AGNOSTIC)) && !defined(_INC_MALLOC) +# define _INC_MALLOC 1 +# include +# undef _INC_MALLOC +#else +# include +#endif + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + +#endif /* !IPRT_INCLUDED_sanitized_intrin_h */ + diff --git a/include/iprt/sanitized/iterator b/include/iprt/sanitized/iterator new file mode 100644 index 00000000..b3c78e0c --- /dev/null +++ b/include/iprt/sanitized/iterator @@ -0,0 +1,60 @@ +/** @file + * Safe way to include the 'iterator' header from the C++ library. + */ + +/* + * Copyright (C) 2020-2022 Oracle and/or its affiliates. + * + * This file is part of VirtualBox base platform packages, as + * available from https://www.virtualbox.org. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, in version 3 of the + * License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included + * in the VirtualBox distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0 + */ + +#ifndef IPRT_INCLUDED_sanitized_iterator +#define IPRT_INCLUDED_sanitized_iterator +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +#ifdef _MSC_VER +/* + * Unfortunately, the 'iterator' file of VCC141 has trouble with C4091 in -Wall mode (via ios): + * xlocnum(1616): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal + */ +# pragma warning(push) +# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/ +# pragma warning(disable:4774) +# endif +#endif + +#include + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + +#endif /* !IPRT_INCLUDED_sanitized_iterator */ + diff --git a/include/iprt/sanitized/sstream b/include/iprt/sanitized/sstream new file mode 100644 index 00000000..46da7af5 --- /dev/null +++ b/include/iprt/sanitized/sstream @@ -0,0 +1,62 @@ +/** @file + * Safe way to include the 'sstream' header from the C++ library. + */ + +/* + * Copyright (C) 2020-2022 Oracle and/or its affiliates. + * + * This file is part of VirtualBox base platform packages, as + * available from https://www.virtualbox.org. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, in version 3 of the + * License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included + * in the VirtualBox distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0 + */ + +#ifndef IPRT_INCLUDED_sanitized_sstream +#define IPRT_INCLUDED_sanitized_sstream +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +#ifdef _MSC_VER +/* + * Unfortunately, the 'sstream' file of VCC141 has trouble with C4091 in -Wall mode + * because it drags in string.h which causes stuff like: + * xlocnum(1616): warning C4774: 'sprintf_s' : format sstream expected in argument 3 is not a sstream literal + * sstream(530): warning C4774: '_scprintf' : format sstream expected in argument 1 is not a sstream literal + */ +# pragma warning(push) +# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/ +# pragma warning(disable:4774) +# endif +#endif + +#include + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + +#endif /* !IPRT_INCLUDED_sanitized_sstream */ + diff --git a/include/iprt/sanitized/string b/include/iprt/sanitized/string new file mode 100644 index 00000000..515d2a13 --- /dev/null +++ b/include/iprt/sanitized/string @@ -0,0 +1,61 @@ +/** @file + * Safe way to include the 'string' header from the C++ library. + */ + +/* + * Copyright (C) 2020-2022 Oracle and/or its affiliates. + * + * This file is part of VirtualBox base platform packages, as + * available from https://www.virtualbox.org. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, in version 3 of the + * License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL), a copy of it is provided in the "COPYING.CDDL" file included + * in the VirtualBox distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0 + */ + +#ifndef IPRT_INCLUDED_sanitized_string +#define IPRT_INCLUDED_sanitized_string +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +#ifdef _MSC_VER +/* + * Unfortunately, the 'string' file of VCC141 has trouble with C4091 in -Wall mode: + * string(530): warning C4774: '_scprintf' : format string expected in argument 1 is not a string literal + * xlocnum(1616): warning C4774: 'sprintf_s' : format string expected in argument 3 is not a string literal + */ +# pragma warning(push) +# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/ +# pragma warning(disable:4774) +# endif +#endif + +#include + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + +#endif /* !IPRT_INCLUDED_sanitized_string */ + -- cgit v1.2.3