From b6efff7e774c0ed32f00a9517732ff3a338d95cd Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 10 Aug 2004 11:33:13 +0000 Subject: [PATCH] plugged more file descriptor leaks. 2004-08-10 Sven Neumann * app/core/gimpbrushgenerated.c (gimp_brush_generated_load): plugged more file descriptor leaks. --- ChangeLog | 5 +++++ app/core/gimpbrushgenerated-load.c | 22 +++++++++++----------- app/core/gimpbrushgenerated-save.c | 22 +++++++++++----------- app/core/gimpbrushgenerated.c | 22 +++++++++++----------- 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a8a4942a1..f9a19eaaa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-10 Sven Neumann + + * app/core/gimpbrushgenerated.c (gimp_brush_generated_load): + plugged more file descriptor leaks. + 2004-08-10 DindinX * app/core/gimpbrushgenerated.c: don't leak a file descriptor when diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c index 0d5b650857..81a2ae2390 100644 --- a/app/core/gimpbrushgenerated-load.c +++ b/app/core/gimpbrushgenerated-load.c @@ -578,12 +578,12 @@ gimp_brush_generated_load (const gchar *filename, GimpBrushGenerated *brush; FILE *file; gchar string[256]; - gchar *name = NULL; - GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; + gchar *name = NULL; + GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; gboolean have_shape = FALSE; + gint spikes = 2; gdouble spacing; gdouble radius; - gint spikes = 2; gdouble hardness; gdouble aspect_ratio; gdouble angle; @@ -613,7 +613,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Not a GIMP brush file."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } /* make sure we are reading a compatible version */ @@ -629,7 +629,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush version."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } else { @@ -668,8 +668,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush shape."), gimp_filename_to_utf8 (filename)); - g_free (name); - return NULL; + goto failed; } shape = shape_val->value; @@ -745,10 +744,11 @@ gimp_brush_generated_load (const gchar *filename, if (name) g_free (name); - g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, - _("Error while reading brush file '%s': %s"), - gimp_filename_to_utf8 (filename), - errno ? g_strerror (errno) : _("File is truncated")); + if (error && *error == NULL) + g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, + _("Error while reading brush file '%s': %s"), + gimp_filename_to_utf8 (filename), + errno ? g_strerror (errno) : _("File is truncated")); return NULL; } diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c index 0d5b650857..81a2ae2390 100644 --- a/app/core/gimpbrushgenerated-save.c +++ b/app/core/gimpbrushgenerated-save.c @@ -578,12 +578,12 @@ gimp_brush_generated_load (const gchar *filename, GimpBrushGenerated *brush; FILE *file; gchar string[256]; - gchar *name = NULL; - GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; + gchar *name = NULL; + GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; gboolean have_shape = FALSE; + gint spikes = 2; gdouble spacing; gdouble radius; - gint spikes = 2; gdouble hardness; gdouble aspect_ratio; gdouble angle; @@ -613,7 +613,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Not a GIMP brush file."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } /* make sure we are reading a compatible version */ @@ -629,7 +629,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush version."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } else { @@ -668,8 +668,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush shape."), gimp_filename_to_utf8 (filename)); - g_free (name); - return NULL; + goto failed; } shape = shape_val->value; @@ -745,10 +744,11 @@ gimp_brush_generated_load (const gchar *filename, if (name) g_free (name); - g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, - _("Error while reading brush file '%s': %s"), - gimp_filename_to_utf8 (filename), - errno ? g_strerror (errno) : _("File is truncated")); + if (error && *error == NULL) + g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, + _("Error while reading brush file '%s': %s"), + gimp_filename_to_utf8 (filename), + errno ? g_strerror (errno) : _("File is truncated")); return NULL; } diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c index 0d5b650857..81a2ae2390 100644 --- a/app/core/gimpbrushgenerated.c +++ b/app/core/gimpbrushgenerated.c @@ -578,12 +578,12 @@ gimp_brush_generated_load (const gchar *filename, GimpBrushGenerated *brush; FILE *file; gchar string[256]; - gchar *name = NULL; - GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; + gchar *name = NULL; + GimpBrushGeneratedShape shape = GIMP_BRUSH_GENERATED_CIRCLE; gboolean have_shape = FALSE; + gint spikes = 2; gdouble spacing; gdouble radius; - gint spikes = 2; gdouble hardness; gdouble aspect_ratio; gdouble angle; @@ -613,7 +613,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Not a GIMP brush file."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } /* make sure we are reading a compatible version */ @@ -629,7 +629,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush version."), gimp_filename_to_utf8 (filename)); - return NULL; + goto failed; } else { @@ -668,8 +668,7 @@ gimp_brush_generated_load (const gchar *filename, _("Fatal parse error in brush file '%s': " "Unknown GIMP brush shape."), gimp_filename_to_utf8 (filename)); - g_free (name); - return NULL; + goto failed; } shape = shape_val->value; @@ -745,10 +744,11 @@ gimp_brush_generated_load (const gchar *filename, if (name) g_free (name); - g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, - _("Error while reading brush file '%s': %s"), - gimp_filename_to_utf8 (filename), - errno ? g_strerror (errno) : _("File is truncated")); + if (error && *error == NULL) + g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, + _("Error while reading brush file '%s': %s"), + gimp_filename_to_utf8 (filename), + errno ? g_strerror (errno) : _("File is truncated")); return NULL; }