Plug some memory leaks

3 files changed, 13 insertions, 6 deletions

diff --git a/src/block-parser.c b/src/block-parser.c
index 9166e0c..688776f 100644
--- a/src/block-parser.c
+++ b/src/block-parser.c
@@ -202,9 +202,11 @@ block_parser_read_and_parse (BlockParser *parser, FILE *stream)
   g_return_val_if_fail (parser != NULL, NULL);
 
   buffer = g_malloc0 (BUFFER_SIZE);
-  parser->current_line = g_strdup ("");
-  if (! fgets (buffer, BUFFER_SIZE, stream) || strlen (buffer) == 0)
+  if (! fgets (buffer, BUFFER_SIZE, stream) || strlen (buffer) == 0) {
+    g_free (buffer);
     return NULL;
+  }
+  parser->current_line = g_strdup ("");
 
   keys = g_hash_table_get_keys (parser->table);
 
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;
diff --git a/src/items.c b/src/items.c
index 33311fd..f41e087 100644
--- a/src/items.c
+++ b/src/items.c
@@ -64,9 +64,11 @@ parse_album_xml (const gchar *filename, TAlbum *index)
     index->type = GALLERY_TYPE_ALBUM;
   else {
     log_error ("Invalid gallery type (%s)\n", gallery_type);
+    g_free (gallery_type);
     g_free (index);
     return FALSE;
   }
+  g_free (gallery_type);
 
   /*  Section General  */
   index->ID = xml_file_get_node_value (xml, "/gallery/general/ID/text()");