[CHORE] Patching TOML manifest parser to avoid null deref.nebuild-patches-deref

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

1 files changed, 93 insertions, 83 deletions

diff --git a/vendor/toml++/impl/print_to_stream.hpp b/vendor/toml++/impl/print_to_stream.hpp
index b6a4895..60eac4e 100644
--- a/vendor/toml++/impl/print_to_stream.hpp
+++ b/vendor/toml++/impl/print_to_stream.hpp
@@ -1,128 +1,138 @@
-//# This file is a part of toml++ and is subject to the the terms of the MIT license.
-//# Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
-//# See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text.
-// SPDX-License-Identifier: MIT
+// # This file is a part of toml++ and is subject to the the terms of the MIT license.
+// # Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
+// # See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text.
+//  SPDX-License-Identifier: MIT
 #pragma once
 
-#include "std_string.hpp"
 #include "forward_declarations.hpp"
 #include "header_start.hpp"
+#include "std_string.hpp"
 
-TOML_IMPL_NAMESPACE_START
-{
-	// Q: "why does print_to_stream() exist? why not just use ostream::write(), ostream::put() etc?"
-	// A: - I'm using <charconv> to format numerics. Faster and locale-independent.
-	//    - I can (potentially) avoid forcing users to drag in <sstream> and <iomanip>.
-	//    - Strings in C++. Honestly.
+TOML_IMPL_NAMESPACE_START {
+  // Q: "why does print_to_stream() exist? why not just use ostream::write(), ostream::put() etc?"
+  // A: - I'm using <charconv> to format numerics. Faster and locale-independent.
+  //    - I can (potentially) avoid forcing users to drag in <sstream> and <iomanip>.
+  //    - Strings in C++. Honestly.
 
-	TOML_EXPORTED_FREE_FUNCTION
-	TOML_ATTR(nonnull)
-	void TOML_CALLCONV print_to_stream(std::ostream&, const char*, size_t);
+  TOML_EXPORTED_FREE_FUNCTION
+  TOML_ATTR(nonnull)
+  void TOML_CALLCONV print_to_stream(std::ostream&, const char*, size_t);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, std::string_view);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, std::string_view);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const std::string&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const std::string&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, char);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, char);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, signed char, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, signed char, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, signed short, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, signed short, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, signed int, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, signed int, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, signed long, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, signed long, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, signed long long, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, signed long long, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, unsigned char, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, unsigned char, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, unsigned short, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, unsigned short, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, unsigned int, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, unsigned int, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, unsigned long, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, unsigned long, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, unsigned long long, value_flags = {}, size_t min_digits = 0);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, unsigned long long, value_flags = {},
+                                     size_t min_digits = 0);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, float, value_flags = {}, bool relaxed_precision = false);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, float, value_flags = {},
+                                     bool relaxed_precision = false);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, double, value_flags = {}, bool relaxed_precision = false);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, double, value_flags = {},
+                                     bool relaxed_precision = false);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, bool);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, bool);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const toml::date&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const toml::date&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const toml::time&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const toml::time&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const toml::time_offset&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const toml::time_offset&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const toml::date_time&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const toml::date_time&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const source_position&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const source_position&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const source_region&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const source_region&);
 
 #if TOML_ENABLE_FORMATTERS
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const array&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const array&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const table&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const table&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<std::string>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<std::string>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<int64_t>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<int64_t>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<double>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<double>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<bool>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<bool>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<date>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<date>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<time>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<time>&);
 
-	TOML_EXPORTED_FREE_FUNCTION
-	void TOML_CALLCONV print_to_stream(std::ostream&, const value<date_time>&);
+  TOML_EXPORTED_FREE_FUNCTION
+  void TOML_CALLCONV print_to_stream(std::ostream&, const value<date_time>&);
 
 #endif
 
-	template <typename T, typename U>
-	inline void print_to_stream_bookended(std::ostream & stream, const T& val, const U& bookend)
-	{
-		print_to_stream(stream, bookend);
-		print_to_stream(stream, val);
-		print_to_stream(stream, bookend);
-	}
+  template <typename T, typename U>
+  inline void print_to_stream_bookended(std::ostream & stream, const T& val, const U& bookend) {
+    print_to_stream(stream, bookend);
+    print_to_stream(stream, val);
+    print_to_stream(stream, bookend);
+  }
 }
 TOML_IMPL_NAMESPACE_END;