From 07686fcd489c52ce8403fb9d17ce304bfb79f312 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 31 Jan 1999 00:57:45 +0000 Subject: [PATCH] Don't g_snprintf into a NULL pointer, which happened in case last_opened_size was greater than 9. --- ChangeLog | 4 ++++ app/gui/menus.c | 3 ++- app/menus.c | 3 ++- app/menus/menus.c | 3 ++- app/widgets/gimpitemfactory.c | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4a0eed012..5859324f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 30 23:47:37 1999 Tor Lillqvist + + * app/menus.c (menus_init_mru): Don't g_snprintf into a NULL pointer. + Wed Jan 27 21:52:43 GMT 1999 Austin Donnelly * app/scale.c: oops - should use the image resolution, not the diff --git a/app/gui/menus.c b/app/gui/menus.c index 0bbe3e9a1e..21a9c6401c 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -497,7 +497,8 @@ menus_init_mru (void) last_opened_entries[i].item_type = NULL; g_snprintf (path, MRU_MENU_ENTRY_SIZE, _("/File/MRU%02d"), i + 1); - g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); + if (accelerator != NULL) + g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); } gtk_item_factory_create_items_ac (toolbox_factory, last_opened_size, diff --git a/app/menus.c b/app/menus.c index 0bbe3e9a1e..21a9c6401c 100644 --- a/app/menus.c +++ b/app/menus.c @@ -497,7 +497,8 @@ menus_init_mru (void) last_opened_entries[i].item_type = NULL; g_snprintf (path, MRU_MENU_ENTRY_SIZE, _("/File/MRU%02d"), i + 1); - g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); + if (accelerator != NULL) + g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); } gtk_item_factory_create_items_ac (toolbox_factory, last_opened_size, diff --git a/app/menus/menus.c b/app/menus/menus.c index 0bbe3e9a1e..21a9c6401c 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -497,7 +497,8 @@ menus_init_mru (void) last_opened_entries[i].item_type = NULL; g_snprintf (path, MRU_MENU_ENTRY_SIZE, _("/File/MRU%02d"), i + 1); - g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); + if (accelerator != NULL) + g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); } gtk_item_factory_create_items_ac (toolbox_factory, last_opened_size, diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index 0bbe3e9a1e..21a9c6401c 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -497,7 +497,8 @@ menus_init_mru (void) last_opened_entries[i].item_type = NULL; g_snprintf (path, MRU_MENU_ENTRY_SIZE, _("/File/MRU%02d"), i + 1); - g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); + if (accelerator != NULL) + g_snprintf (accelerator, MRU_MENU_ACCEL_SIZE, "%d", i + 1); } gtk_item_factory_create_items_ac (toolbox_factory, last_opened_size,