Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some fixes from coverity (only one really nasty, in paint_proj).

Browse Source
This commit is contained in:
Bastien Montagne
2015-12-28 16:08:36 +01:00
parent 1a246afe03
commit 6f1c44e611
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/intern/fileops.c
View File

@@ -825,7 +825,7 @@ static int copy_single_file(const char *from, const char *to)
ssize_t link_len; ssize_t link_len;
/* get large enough buffer to read link content */ /* get large enough buffer to read link content */
if (st.st_size < sizeof(buf)) { if ((st.st_size + 1) < sizeof(buf)) {
link_buffer = buf; link_buffer = buf;
need_free = 0; need_free = 0;
} }
@@ -843,7 +843,7 @@ static int copy_single_file(const char *from, const char *to)
return RecursiveOp_Callback_Error; return RecursiveOp_Callback_Error;
} }
link_buffer[link_len] = 0; link_buffer[link_len] = '\0';
if (symlink(link_buffer, to)) { if (symlink(link_buffer, to)) {
perror("symlink"); perror("symlink");

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@@ -5730,7 +5730,7 @@ static int texture_paint_add_texture_paint_slot_invoke(bContext *C, wmOperator *
BLI_assert(type != -1); BLI_assert(type != -1);
/* take the second letter to avoid the ID identifier */ /* take the second letter to avoid the ID identifier */
BLI_snprintf(imagename, FILE_MAX, "%s %s", &ma->id.name[2], layer_type_items[type].name); BLI_snprintf(imagename, sizeof(imagename), "%s %s", &ma->id.name[2], layer_type_items[type].name);
RNA_string_set(op->ptr, "name", imagename); RNA_string_set(op->ptr, "name", imagename);
return WM_operator_props_dialog_popup(C, op, 15 * UI_UNIT_X, 5 * UI_UNIT_Y); return WM_operator_props_dialog_popup(C, op, 15 * UI_UNIT_X, 5 * UI_UNIT_Y);