diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-22 20:34:37 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-22 20:34:37 +0300 |
| commit | a6167306a29d1acf1a36539604612c98a7051273 (patch) | |
| tree | 6c35087895b0ee0513b612734774f896b3b1bc7f /source/blender/editors/space_node | |
| parent | d794ce627faab1f107ef8fd366294b9990cfe446 (diff) | |
| parent | 3174cbe8f2d3fa384b644a62b3c265a946ab866f (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index db5d489cfbc..a1980c88d7e 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -208,12 +208,10 @@ void ED_node_tree_path_get_fixedbuf(SpaceNode *snode, char *value, int max_lengt value[0] = '\0'; for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) { if (i == 0) { - BLI_strncpy(value, path->node_name, max_length); - size = strlen(path->node_name); + size = BLI_strncpy_rlen(value, path->node_name, max_length); } else { - BLI_snprintf(value, max_length, "/%s", path->node_name); - size = strlen(path->node_name) + 1; + size = BLI_snprintf_rlen(value, max_length, "/%s", path->node_name); } max_length -= size; if (max_length <= 0) |