Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-05-22 17:59:01 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-05-22 17:59:22 +0300
commite529882be0752cdfd4fcf2f6b6bc06bcb44947af (patch)
treea534e665111adc7f276d87716f321dce7d1855e6 /source/blender/editors/curve/editcurve.c
parentcd9dc3143c16878dbb8b2fe7bba2163c6982db4e (diff)
Fix second crashing part of T44497, out of bounds access to hook
modifier data. Unfortunately seems like we also lose the hook mapping by doing this, but this can be fixed later and is probably a separate issue.
Diffstat (limited to 'source/blender/editors/curve/editcurve.c')
-rw-r--r--source/blender/editors/curve/editcurve.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index f50eee7033b..d4fb3d41d24 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -1188,7 +1188,7 @@ static int *initialize_index_map(Object *obedit, int *r_old_totvert)
while (a--) {
keyIndex = getCVKeyIndex(editnurb, bezt);
- if (keyIndex) {
+ if (keyIndex && keyIndex->vertex_index * 3 < old_totvert) {
if (keyIndex->switched) {
old_to_new_map[keyIndex->vertex_index] = vertex_index + 2;
old_to_new_map[keyIndex->vertex_index + 1] = vertex_index + 1;