From 6a65e34e42cb584d470f84a7b3760f289d11c0a2 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sun, 20 Sep 2009 12:39:45 +0200
Subject: Plug some memory leaks

---
 src/generators.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/generators.c')

diff --git a/src/generators.c b/src/generators.c
index d64f5b2..0db1b76 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -224,7 +224,8 @@ write_html_album (TGallerySetup *setup,
   TIndexItem *item;
   TIndexItem *tmp_item;
   int level, old_parent_item_index;
-  gboolean res, bb;
+  gboolean res;
+  int bb;
   int i;
   unsigned int real_total_items;
   ReplaceTable *global_replace_table;
@@ -450,7 +451,7 @@ write_html_album (TGallerySetup *setup,
     /*  Write to file  */
     bb = fputs (line, fout);
     g_free (line);
-    if (! bb) {
+    if (bb < 0) {
       log_error ("write_html_index: error writing to file \"%s\": %s\n", dst, strerror (errno));
       res = FALSE;
       break;
@@ -500,7 +501,8 @@ write_html_image (TGallerySetup *setup,
   gchar *s1, *s2, *s3, *s4, *s5;
   gchar *imgname, *preload_imgname;
   gchar *title, *title_desc;
-  gboolean res, bb;
+  gboolean res;
+  int bb;
   int level, old_parent_item_index;
   gboolean override_title_meta;
   gboolean image_fullsize;
@@ -742,6 +744,7 @@ write_html_image (TGallerySetup *setup,
     else
       s2 = g_strdup_printf ("%s\t<link rel=\"icon\" href=\"%s%s\" />\n", s1, setup->support_files_use_common_root ? s3 : "", setup->favicon_file);
     g_free (s1);
+    g_free (s3);
     s1 = s2;
   }
   replace_table_add_key (replace_table, "CGG_META_TAGS", s1);
@@ -783,7 +786,7 @@ write_html_image (TGallerySetup *setup,
     /*  Write to file  */
     bb = fputs (line, fout);
     g_free (line);
-    if (! bb) {
+    if (bb < 0) {
       log_error ("write_html_image: error writing to file \"%s\": %s\n", dst, strerror (errno));
       res = FALSE;
       break;
-- 
cgit v1.2.3