From eff6ee8b64fc29940a7ea8f49a41759fb40b4dc1 Mon Sep 17 00:00:00 2001 From: CST 1998 Larry Ewing Date: Fri, 20 Mar 1998 04:06:13 +0000 Subject: [PATCH] fixed out of bounds reference in pallete_create. The dialogs are a mess. Thu Mar 19 22:05:56 CST 1998 Larry Ewing * app/palette.c: fixed out of bounds reference in pallete_create. The dialogs are a mess. --- ChangeLog | 5 +++++ app/gui/palette-editor.c | 11 ++++------- app/palette.c | 11 ++++------- app/widgets/gimppaletteeditor.c | 11 ++++------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22685ecb45..d1db9cbf86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 19 22:05:56 CST 1998 Larry Ewing + + * app/palette.c: fixed out of bounds reference in pallete_create. + The dialogs are a mess. + Thu Mar 19 18:36:09 PST 1998 Manish Singh * ltmain.sh: libtool patch for Solaris diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 1fa55bc3f9..56f1461241 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -150,6 +150,7 @@ palette_create () GtkWidget *arrow; GtkWidget *menu_bar; GtkWidget *menu_bar_item; + int i; if (!palette) { @@ -182,13 +183,9 @@ palette_create () gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); /* The popup menu -- palette_ops */ - palette_ops[0].user_data = palette; - palette_ops[1].user_data = palette; - palette_ops[2].user_data = palette; - palette_ops[3].user_data = palette; - palette_ops[4].user_data = palette; - palette_ops[5].user_data = palette; - palette_ops[6].user_data = palette; + for (i = 0; palette_ops[i].label; i++) + palette_ops[i].user_data = palette; + palette->palette_ops = build_menu (palette_ops, NULL); /* The palette commands pulldown menu */ diff --git a/app/palette.c b/app/palette.c index 1fa55bc3f9..56f1461241 100644 --- a/app/palette.c +++ b/app/palette.c @@ -150,6 +150,7 @@ palette_create () GtkWidget *arrow; GtkWidget *menu_bar; GtkWidget *menu_bar_item; + int i; if (!palette) { @@ -182,13 +183,9 @@ palette_create () gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); /* The popup menu -- palette_ops */ - palette_ops[0].user_data = palette; - palette_ops[1].user_data = palette; - palette_ops[2].user_data = palette; - palette_ops[3].user_data = palette; - palette_ops[4].user_data = palette; - palette_ops[5].user_data = palette; - palette_ops[6].user_data = palette; + for (i = 0; palette_ops[i].label; i++) + palette_ops[i].user_data = palette; + palette->palette_ops = build_menu (palette_ops, NULL); /* The palette commands pulldown menu */ diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 1fa55bc3f9..56f1461241 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -150,6 +150,7 @@ palette_create () GtkWidget *arrow; GtkWidget *menu_bar; GtkWidget *menu_bar_item; + int i; if (!palette) { @@ -182,13 +183,9 @@ palette_create () gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); /* The popup menu -- palette_ops */ - palette_ops[0].user_data = palette; - palette_ops[1].user_data = palette; - palette_ops[2].user_data = palette; - palette_ops[3].user_data = palette; - palette_ops[4].user_data = palette; - palette_ops[5].user_data = palette; - palette_ops[6].user_data = palette; + for (i = 0; palette_ops[i].label; i++) + palette_ops[i].user_data = palette; + palette->palette_ops = build_menu (palette_ops, NULL); /* The palette commands pulldown menu */