blender
/
blender
136
403
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Fix: Escape property name when keying #119922

Merged
Christoph Lendenfeld merged 3 commits from ChrisLend/blender:fix_escape_property_name into main 2024-04-02 16:25:11 +02:00
Conversation 1 Commits 3 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/animation/CMakeLists.txt
View File

@ -10,6 +10,7 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../extern/fmtlib/include
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)

8
source/blender/editors/animation/keyframing.cc
View File

@ -9,6 +9,8 @@
#include <cstddef>
#include <cstdio>
#include <fmt/format.h>
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
@ -298,9 +300,9 @@ static blender::Vector<std::string> construct_rna_paths(PointerRNA *ptr)
if (insert_channel_flags & USER_ANIM_KEY_CHANNEL_CUSTOM_PROPERTIES) {
if (properties) {
LISTBASE_FOREACH (IDProperty *, prop, &properties->data.group) {
std::string name = prop->name;
std::string rna_path = "[\"" + name + "\"]";
paths.append(rna_path);
char name_escaped[MAX_IDPROP_NAME * 2];
Hans Goudey commented 2024-03-26 16:14:59 +01:00
Review
Copy Link

This will leak the result of BLI_sprintfN which allocates a char *. It should be replaced by fmt::format

This will leak the result of `BLI_sprintfN` which allocates a `char *`. It should be replaced by `fmt::format`
Christoph Lendenfeld commented 2024-03-26 16:32:58 +01:00
Review
Copy Link

thanks, changed :)

thanks, changed :)
BLI_str_escape(name_escaped, prop->name, sizeof(name_escaped));
paths.append(fmt::format("[\"{}\"]", name_escaped));
}
Hans Goudey commented 2024-03-26 16:49:37 +01:00
Review
Copy Link

To avoid copying the string, use std::move or put the fmt::format call directly inside append(..)

To avoid copying the string, use `std::move` or put the `fmt::format` call directly inside `append(..)`
}
}