108dad4e52
Strings that include Latin1 encoding or corrupt UTF8 byte sequences
could read past the buffer bounds (stepping over the null terminator).
Resolve by passing in the string length.
Other changes to support non-UTF8 byte sequences:
- BLI_str_utf8_offset_{to/from}_index were accumulating
the UTF8 offset without accounting for non-UTF8 characters
which could cause a buffer underflow or enter an eternal loop.
- BLI_str_utf8_offset_to_index would read past the buffer bounds if the
offset passed in if it was in the middle of a UTF8 byte sequence.
45 lines
1.4 KiB
C++
45 lines
1.4 KiB
C++
/* SPDX-FileCopyrightText: 2023 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
#include "BLI_string_utf8.h"
|
|
|
|
#include "node_function_util.hh"
|
|
|
|
namespace blender::nodes::node_fn_slice_string_cc {
|
|
|
|
static void node_declare(NodeDeclarationBuilder &b)
|
|
{
|
|
b.add_input<decl::String>("String");
|
|
b.add_input<decl::Int>("Position");
|
|
b.add_input<decl::Int>("Length").min(0).default_value(10);
|
|
b.add_output<decl::String>("String");
|
|
}
|
|
|
|
static void node_build_multi_function(NodeMultiFunctionBuilder &builder)
|
|
{
|
|
static auto slice_fn = mf::build::SI3_SO<std::string, int, int, std::string>(
|
|
"Slice", [](const std::string &str, int a, int b) {
|
|
const int len = BLI_strlen_utf8(str.c_str());
|
|
const int start = BLI_str_utf8_offset_from_index(
|
|
str.c_str(), str.size(), std::clamp(a, 0, len));
|
|
const int end = BLI_str_utf8_offset_from_index(
|
|
str.c_str(), str.size(), std::clamp(a + b, 0, len));
|
|
return str.substr(start, std::max<int>(end - start, 0));
|
|
});
|
|
builder.set_matching_fn(&slice_fn);
|
|
}
|
|
|
|
static void node_register()
|
|
{
|
|
static bNodeType ntype;
|
|
|
|
fn_node_type_base(&ntype, FN_NODE_SLICE_STRING, "Slice String", NODE_CLASS_CONVERTER);
|
|
ntype.declare = node_declare;
|
|
ntype.build_multi_function = node_build_multi_function;
|
|
nodeRegisterType(&ntype);
|
|
}
|
|
NOD_REGISTER_NODE(node_register)
|
|
|
|
} // namespace blender::nodes::node_fn_slice_string_cc
|