archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for unlikely NULL pointer dereference

Browse Source 
Potential crash reading freestyle modifiers from future blend-files
This commit is contained in:
Campbell Barton
2015-02-20 17:17:36 +11:00
parent 1ec83f41c1
commit 919e38cfc8
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/linestyle.c
View File

@@ -280,6 +280,9 @@ LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyl
LineStyleModifier *m;
m = alloc_color_modifier(name, type);
if (UNLIKELY(m == NULL)) {
return NULL;
}
m->blend = MA_RAMP_BLEND;
switch (type) {
@@ -314,6 +317,9 @@ LineStyleModifier *BKE_linestyle_color_modifier_copy(FreestyleLineStyle *linesty
LineStyleModifier *new_m;
new_m = alloc_color_modifier(m->name, m->type);
if (UNLIKELY(new_m == NULL)) {
return NULL;
}
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;