Merged from trunk:

2008-08-23  Lars-Peter Clausen  <lars@metafoo.de>

	Merged from trunk:
		
	* app/core/gimpgradient.c (gimp_gradient_segment_range_delete):
	Don't dereference final_start_seg and final_end_seg if NULL.


svn path=/branches/gimp-2-4/; revision=26727
This commit is contained in:
Lars-Peter Clausen 2008-08-23 13:35:54 +00:00 committed by Lars-Peter Clausen
parent 52294e79da
commit 882cf588e5
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2008-08-23 Lars-Peter Clausen <lars@metafoo.de>
Merged from trunk:
* app/core/gimpgradient.c (gimp_gradient_segment_range_delete):
Don't dereference final_start_seg and final_end_seg if NULL.
2008-08-23 Lars-Peter Clausen <lars@metafoo.de>
Merged from trunk:

View File

@ -1682,8 +1682,10 @@ gimp_gradient_segment_range_delete (GimpGradient *gradient,
return;
premature_return:
*final_start_seg = start_seg;
*final_end_seg = end_seg;
if (final_start_seg)
*final_start_seg = start_seg;
if (final_end_seg)
*final_end_seg = end_seg;
}
void