From afbd8024110aaa80a7b94cff9a9d96e763b13916 Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 22 Jan 2024 16:32:18 +0000 Subject: Fixed BasicParser::_file_path relying on externally controlled memory --- src/openvic-dataloader/detail/Warnings.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/openvic-dataloader/detail/Warnings.hpp') diff --git a/src/openvic-dataloader/detail/Warnings.hpp b/src/openvic-dataloader/detail/Warnings.hpp index 6c0b34e..8fc09bd 100644 --- a/src/openvic-dataloader/detail/Warnings.hpp +++ b/src/openvic-dataloader/detail/Warnings.hpp @@ -1,13 +1,15 @@ #pragma once -#include +#include + +#include namespace ovdl::v2script::warnings { - inline const ParseWarning make_utf8_warning(const char* file_path) { + inline const ParseWarning make_utf8_warning(std::string_view file_path) { constexpr std::string_view message_suffix = "This may cause problems. Prefer Windows-1252 encoding."; std::string message; - if (!file_path) { + if (file_path.empty()) { message = "Buffer is a UTF-8 encoded string. " + std::string(message_suffix); } else { message = "File '" + std::string(file_path) + "' is a UTF-8 encoded file. " + std::string(message_suffix); -- cgit v1.2.3-56-ga3b1