fix a couple of memory leaks

[claws.git] / src / prefs_gtk.c

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 20c6eab63b7f9eeef16c09df210bb3594d0db6d4..dc7e5cf10f6c98d4464fe199e01d8cdcacbf89d5 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #define _GNU_SOURCE
@@ -40,7 +41,6 @@
 #include "utils.h"
 #include "gtkutils.h"
 #include "passcrypt.h"
-#include "base64.h"
 #include "codeconv.h"
 
 #define CL(x)  (((gulong) (x) >> (gulong) 8) & 0xFFUL)
@@ -75,9 +75,9 @@ void prefs_read_config(PrefParam *param, const gchar *label,
        gchar buf[PREFSBUFSIZE];
        gchar *block_label;
 
-       g_return_if_fail(param != NULL);
-       g_return_if_fail(label != NULL);
-       g_return_if_fail(rcfile != NULL);
+       cm_return_if_fail(param != NULL);
+       cm_return_if_fail(label != NULL);
+       cm_return_if_fail(rcfile != NULL);
 
        if (encoding != NULL)
                g_warning("Encoding is ignored\n");
@@ -219,14 +219,16 @@ static void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
                case P_PASSWORD:
                        g_free(*((gchar **)param[i].data));
                        if (value[0] == '!') {
-                               gchar tmp[1024];
-                               gint len;
-
-                               len = base64_decode(tmp, &value[1], strlen(value) - 1);
-                               passcrypt_decrypt(tmp, len);
-                               tmp[len] = '\0';
+                               gchar *tmp, buf[1024];
+                               gsize len;
+
+                               tmp = g_base64_decode(&value[1], &len);
+                               g_strlcat(buf, tmp, 1024);
+                               g_free(tmp);
+                               buf[len] = '\0';
+                               passcrypt_decrypt(buf, len);
                                *((gchar **)param[i].data) =
-                                       *tmp ? g_strdup(tmp) : NULL;
+                                       *buf ? g_strdup(buf) : NULL;
                        } else {
                                *((gchar **)param[i].data) =
                                        *value ? g_strdup(value) : NULL;
@@ -259,9 +261,9 @@ void prefs_write_config(PrefParam *param, const gchar *label,
        gchar *block_label = NULL;
        gboolean block_matched = FALSE;
 
-       g_return_if_fail(param != NULL);
-       g_return_if_fail(label != NULL);
-       g_return_if_fail(rcfile != NULL);
+       cm_return_if_fail(param != NULL);
+       cm_return_if_fail(label != NULL);
+       cm_return_if_fail(rcfile != NULL);
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, rcfile, NULL);
        if ((orig_fp = g_fopen(rcpath, "rb")) == NULL) {
@@ -382,7 +384,7 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
                        break;
                case P_PASSWORD:
                        {
-                               gchar *tmp = NULL, tmp2[1024] = {0};
+                               gchar *tmp = NULL, *tmp2 = NULL;
 
                                tmp = *((gchar **)param[i].data);
                                if (tmp) {
@@ -391,13 +393,14 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
                                        tmp = g_strdup(tmp);
                                        len = strlen(tmp);
                                        passcrypt_encrypt(tmp, len);
-                                       base64_encode(tmp2, tmp, len);
+                                       tmp2 = g_base64_encode(tmp, len);
                                        g_free(tmp);
                                        tmp = tmp2;
                                }
                                g_snprintf(buf, sizeof(buf), "%s=!%s\n", param[i].name,
                                           tmp ?
                                           tmp : "");
+                               g_free(tmp);
                        }
                        break;
                default:
@@ -422,7 +425,7 @@ void prefs_set_default(PrefParam *param)
        gint i;
        GdkColor color;
 
-       g_return_if_fail(param != NULL);
+       cm_return_if_fail(param != NULL);
 
        for (i = 0; param[i].name != NULL; i++) {
                if (!param[i].data) continue;
@@ -451,11 +454,9 @@ void prefs_set_default(PrefParam *param)
                                                g_strconcat(get_home_dir(),
                                                            param[i].defval + 1,
                                                            NULL);
-                               else if (param[i].defval[0] != '\0')
+                               else 
                                        *((gchar **)param[i].data) =
                                                g_strdup(param[i].defval);
-                               else
-                                       *((gchar **)param[i].data) = NULL;
                        } else
                                *((gchar **)param[i].data) = NULL;
                        break;
@@ -521,7 +522,7 @@ void prefs_free(PrefParam *param)
 {
        gint i;
 
-       g_return_if_fail(param != NULL);
+       cm_return_if_fail(param != NULL);
 
        for (i = 0; param[i].name != NULL; i++) {
                if (!param[i].data) continue;
@@ -656,7 +657,7 @@ void prefs_set_data_from_entry(PrefParam *pparam)
        gchar **str;
        const gchar *entry_str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        entry_str = gtk_entry_get_text(GTK_ENTRY(*pparam->widget));
 
@@ -683,7 +684,7 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
 {
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -701,7 +702,7 @@ void prefs_set_entry(PrefParam *pparam)
 {
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -728,7 +729,7 @@ void prefs_set_entry_from_escaped(PrefParam *pparam)
 {
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -748,7 +749,7 @@ void prefs_set_data_from_text(PrefParam *pparam)
        gchar *text = NULL, *tp = NULL;
        gchar *tmp, *tmpp;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -767,7 +768,7 @@ void prefs_set_data_from_text(PrefParam *pparam)
                        tp = text = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
                }
 
-               g_return_if_fail (tp && text);
+               cm_return_if_fail (tp && text);
 
                if (text[0] == '\0') {
                        *str = NULL;
@@ -799,7 +800,7 @@ void prefs_set_escaped_data_from_text(PrefParam *pparam)
 {
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -821,7 +822,7 @@ void prefs_set_text(PrefParam *pparam)
        GtkTextBuffer *buffer;
        GtkTextIter iter;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -860,7 +861,7 @@ void prefs_set_text_from_escaped(PrefParam *pparam)
 {
        gchar **str;
 
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_STRING:
@@ -876,8 +877,8 @@ void prefs_set_text_from_escaped(PrefParam *pparam)
 
 void prefs_set_data_from_toggle(PrefParam *pparam)
 {
-       g_return_if_fail(pparam->type == P_BOOL);
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(pparam->type == P_BOOL);
+       cm_return_if_fail(*pparam->widget != NULL);
        
        *((gboolean *)pparam->data) =
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(*pparam->widget));
@@ -885,8 +886,8 @@ void prefs_set_data_from_toggle(PrefParam *pparam)
 
 void prefs_set_toggle(PrefParam *pparam)
 {
-       g_return_if_fail(pparam->type == P_BOOL);
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(pparam->type == P_BOOL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(*pparam->widget),
                                     *((gboolean *)pparam->data));
@@ -894,7 +895,7 @@ void prefs_set_toggle(PrefParam *pparam)
 
 void prefs_set_data_from_spinbtn(PrefParam *pparam)
 {
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_INT:
@@ -915,7 +916,7 @@ void prefs_set_data_from_spinbtn(PrefParam *pparam)
 
 void prefs_set_spinbtn(PrefParam *pparam)
 {
-       g_return_if_fail(*pparam->widget != NULL);
+       cm_return_if_fail(*pparam->widget != NULL);
 
        switch (pparam->type) {
        case P_INT: