diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-20 09:17:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-20 09:18:41 +0300 |
| commit | 919e38cfc800fa2ee148e9b4ea8e2e56f4bc08b6 (patch) | |
| tree | e2b1c3ff23549f07590a83819256933bd577403b /source/blender/blenkernel/intern/linestyle.c | |
| parent | 1ec83f41c1be97e757ebdca357b39ee0cca240c1 (diff) | |
Fix for unlikely NULL pointer dereference
Potential crash reading freestyle modifiers from future blend-files
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index d244e9d79d2..1a5760b049c 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -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; |