From 52294e79dafafc6d60ad9ac9a66e332e77d04ad2 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 23 Aug 2008 13:33:39 +0000 Subject: [PATCH] Merged from trunk: 2008-08-23 Lars-Peter Clausen Merged from trunk: * tools/pdbgen/pdb/gradient.pdb (gimp_gradient_segment_range_blend_(colors|opacity)): Don't crash if the index of the last segment is out of range. * app/pdb/gradient-cmds.c: regenerated. svn path=/branches/gimp-2-4/; revision=26726 --- ChangeLog | 10 ++++++++++ app/pdb/gradient_cmds.c | 6 ++++++ tools/pdbgen/pdb/gradient.pdb | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index d405ff746c..3524bc473f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-08-23 Lars-Peter Clausen + + Merged from trunk: + + * tools/pdbgen/pdb/gradient.pdb + (gimp_gradient_segment_range_blend_(colors|opacity)): Don't crash + if the index of the last segment is out of range. + + * app/pdb/gradient-cmds.c: regenerated. + 2008-08-23 Sven Neumann * plug-ins/twain/Makefile.am: merged changes from trunk (bug #548940). diff --git a/app/pdb/gradient_cmds.c b/app/pdb/gradient_cmds.c index 3a070ee46e..50c79c0b7f 100644 --- a/app/pdb/gradient_cmds.c +++ b/app/pdb/gradient_cmds.c @@ -1226,6 +1226,9 @@ gradient_segment_range_blend_colors_invoker (GimpProcedure *procedure, if (start_seg && GIMP_DATA (gradient)->writable) { + if (!end_seg) + end_seg = gimp_gradient_segment_get_last (start_seg); + gimp_gradient_segment_range_blend (gradient, start_seg, end_seg, &start_seg->left_color, @@ -1266,6 +1269,9 @@ gradient_segment_range_blend_opacity_invoker (GimpProcedure *procedure, if (start_seg && GIMP_DATA (gradient)->writable) { + if (!end_seg) + end_seg = gimp_gradient_segment_get_last (start_seg); + gimp_gradient_segment_range_blend (gradient, start_seg, end_seg, &start_seg->left_color, diff --git a/tools/pdbgen/pdb/gradient.pdb b/tools/pdbgen/pdb/gradient.pdb index b180b4f0f5..24f98e0490 100644 --- a/tools/pdbgen/pdb/gradient.pdb +++ b/tools/pdbgen/pdb/gradient.pdb @@ -1227,6 +1227,9 @@ HELP if (start_seg && GIMP_DATA (gradient)->writable) { + if (!end_seg) + end_seg = gimp_gradient_segment_get_last (start_seg); + gimp_gradient_segment_range_blend (gradient, start_seg, end_seg, &start_seg->left_color, @@ -1273,6 +1276,9 @@ HELP if (start_seg && GIMP_DATA (gradient)->writable) { + if (!end_seg) + end_seg = gimp_gradient_segment_get_last (start_seg); + gimp_gradient_segment_range_blend (gradient, start_seg, end_seg, &start_seg->left_color,