dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed out-of-bounds access in gradient selection widget. Presumably fixes 

2005-01-09  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpgradientmenu.c: fixed out-of-bounds access in
	gradient selection widget. Presumably fixes bug #163427.
This commit is contained in:
Sven Neumann 2005-01-09 20:15:24 +00:00 committed by Sven Neumann
parent fb73b3d786
commit 773345cb6d
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-01-09 Sven Neumann <sven@gimp.org>
* libgimp/gimpgradientmenu.c: fixed out-of-bounds access in
gradient selection widget. Presumably fixes bug #163427.
2005-01-09 Sven Neumann <sven@gimp.org>
* app/widgets/gimpcontrollerkeyboard.c: changed "Key" to "Cursor".

41
libgimp/gimpgradientmenu.c
View File

@ -49,7 +49,7 @@ struct _GradientSelect
gchar *gradient_name; /* Local copy */
gint sample_size;
gboolean reverse;
gint width;
gint n_samples;
gdouble *gradient_data; /* Local copy */
const gchar *temp_gradient_callback;
@ -59,9 +59,9 @@ struct _GradientSelect
/* local function prototypes */
static void gimp_gradient_select_widget_callback (const gchar *name,
gint width,
gint n_samples,
const gdouble *gradient_data,
gint closing,
gboolean closing,
gpointer data);
static void gimp_gradient_select_widget_clicked (GtkWidget *widget,
GradientSelect *gradient_sel);
@ -198,8 +198,8 @@ gimp_gradient_select_widget_set (GtkWidget *widget,
else
{
gchar *name;
gint n_samples;
gdouble *samples;
gint n_samples;
if (! gradient_name || ! strlen (gradient_name))
name = gimp_context_get_gradient ();
@ -228,25 +228,27 @@ gimp_gradient_select_widget_set (GtkWidget *widget,
static void
gimp_gradient_select_widget_callback (const gchar *name,
gint width,
gint n_samples,
const gdouble *gradient_data,
gint closing,
gboolean closing,
gpointer data)
{
GradientSelect *gradient_sel = (GradientSelect *) data;
GradientSelect *gradient_sel = data;
g_free (gradient_sel->gradient_name);
g_free (gradient_sel->gradient_data);
gradient_sel->gradient_name = g_strdup (name);
gradient_sel->width = width;
gradient_sel->n_samples = n_samples;
gradient_sel->gradient_data = g_memdup (gradient_data,
width * 4 * sizeof (gdouble));
n_samples * sizeof (gdouble));
gtk_widget_queue_draw (gradient_sel->preview);
if (gradient_sel->callback)
gradient_sel->callback (name, width, gradient_data, closing, gradient_sel->data);
gradient_sel->callback (name,
n_samples, gradient_data, closing,
gradient_sel->data);
if (closing)
gradient_sel->temp_gradient_callback = NULL;
@ -294,8 +296,8 @@ gimp_gradient_select_preview_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
GradientSelect *gradient_sel)
{
gint n_samples;
gdouble *samples;
gint n_samples;
if (gimp_gradient_get_uniform_samples (gradient_sel->gradient_name,
allocation->width,
@ -303,10 +305,10 @@ gimp_gradient_select_preview_size_allocate (GtkWidget *widget,
&n_samples,
&samples))
{
gradient_sel->sample_size = allocation->width;
gradient_sel->width = n_samples;
g_free (gradient_sel->gradient_data);
gradient_sel->sample_size = allocation->width;
gradient_sel->n_samples = n_samples;
gradient_sel->gradient_data = samples;
}
}
@ -321,16 +323,19 @@ gimp_gradient_select_preview_expose (GtkWidget *widget,
guchar *p1;
guchar *even;
guchar *odd;
gint width;
gint x, y;
src = gradient_sel->gradient_data;
if (! src)
return;
p0 = even = g_malloc (gradient_sel->width * 3);
p1 = odd = g_malloc (gradient_sel->width * 3);
width = gradient_sel->n_samples / 4;
for (x = 0; x < gradient_sel->width; x++)
p0 = even = g_malloc (width * 3);
p1 = odd = g_malloc (width * 3);
for (x = 0; x < width; x++)
{
gdouble r, g, b, a;
gdouble c0, c1;
@ -370,7 +375,7 @@ gimp_gradient_select_preview_expose (GtkWidget *widget,
event->area.width, 1,
GDK_RGB_DITHER_MAX,
buf + event->area.x * 3,
gradient_sel->width * 3,
width * 3,
- event->area.x, - y);
}