graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 04:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for NULL before using a string pointer. Fixes bug #343121.

Browse source 
2006-05-29  Sven Neumann  <sven@gimp.org>

	* plug-ins/gimpressionist/presets.c: check for NULL before using a
	string pointer. Fixes bug #343121.
This commit is contained in:
Sven Neumann 2006-05-29 09:39:30 +00:00 committed by Sven Neumann
parent 52d56985c1
commit 651a102cf8
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-05-29 Sven Neumann <sven@gimp.org>
* plug-ins/gimpressionist/presets.c: check for NULL before using a
string pointer. Fixes bug #343121.
2006-05-28 Michael Natterer <mitch@gimp.org>
* plug-ins/common/pnm.c: applied patch from Martin Collins which

30
plug-ins/gimpressionist/presets.c
View file

@ -33,14 +33,14 @@
#define PRESETMAGIC "Preset"
static GtkWidget *presetnameentry = NULL;
static GtkWidget *presetlist = NULL;
static GtkWidget *presetdesclabel = NULL;
static GtkWidget *presetnameentry = NULL;
static GtkWidget *presetlist = NULL;
static GtkWidget *presetdesclabel = NULL;
static GtkWidget *presetsavebutton = NULL;
static GtkWidget *delete_button = NULL;
static GtkListStore *store;
static GtkWidget *delete_button = NULL;
static GtkListStore *store = NULL;
static gchar *selected_preset_orig_name = NULL;
static gchar *selected_preset_filename = NULL;
static gchar *selected_preset_filename = NULL;
static gboolean
can_delete_preset (const gchar *abs)
@ -695,11 +695,13 @@ save_preset (void)
/* Create the ~/.gimp-$VER/gimpressionist/Presets directory if
* it doesn't already exists.
* */
presets_dir_path = g_build_filename ((const char *) thispath->data, "Presets",
*
*/
presets_dir_path = g_build_filename ((const gchar *) thispath->data,
"Presets",
NULL);
if (!g_file_test (presets_dir_path, G_FILE_TEST_IS_DIR))
if (! g_file_test (presets_dir_path, G_FILE_TEST_IS_DIR))
{
if (g_mkdir (presets_dir_path,
S_IRUSR | S_IWUSR | S_IXUSR |
@ -713,10 +715,11 @@ save_preset (void)
}
}
/* Check if the user-friendly name has changed. If so, then save it under
* a new file. If not - use the same file name.
* */
if (!strcmp (preset_name, selected_preset_orig_name))
/* Check if the user-friendly name has changed. If so, then save it
* under a new file. If not - use the same file name.
*/
if (selected_preset_orig_name &&
strcmp (preset_name, selected_preset_orig_name) == 0)
{
fname = g_build_filename (presets_dir_path,
selected_preset_filename,
@ -726,6 +729,7 @@ save_preset (void)
{
fname = preset_create_filename (preset_name, presets_dir_path);
}
g_free (presets_dir_path);
if (!fname)