init some pointers that possibly caused a segfault reported in the claws-users ML

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c5aa30e98befa30330c38766e467d58888237efd..5b8bd5dec567f0f576c1ba70f8eec41d16b3c149 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-11-04 [christoph] 0.6.4claws23
+
+       * src/main.c
+       * src/prefs_common.[ch]
+               init some pointers that possibly caused a segfault
+               reported in the claws-users ML
+
 2001-11-04 [hoa]       0.6.4claws22
 
        * src/grouplistdialog.c

diff --git a/configure.in b/configure.in
index 80f2973064abd8b23e638e3bb5093faf567631c9..535ff65ff3595fd8725a11eb514044d6d30bba86 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws23
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/main.c b/src/main.c
index 18f8c4c572f7f7f592a1a3b0bd00a7e811735b08..464ea2fb361b8dad18b471580dfb28fa540c4d79 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -220,6 +220,7 @@ int main(int argc, char *argv[])
                                      "rename");
        }
 
+       prefs_common_init();
        prefs_common_read_config();
 
 #if USE_GPGME

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 62c070621b53a94ab955b022dbe27719977ca483..1d7a21a047697bdaa67d8ea3ab38da4c6814d249 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -757,6 +757,11 @@ static void prefs_common_cancel            (void);
 static void compose_prefs_fmt_open(void);
 static void compose_prefs_fmt_create(void);
 
+void prefs_common_init() {
+       prefs_common.fltlist = NULL;
+       prefs_common.disphdr_list = NULL;
+}
+
 void prefs_common_read_config(void)
 {
        prefs_read_config(param, "Common", COMMON_RC);

diff --git a/src/prefs_common.h b/src/prefs_common.h
index edf80c2e17f2d107225a29f5e69dfb5185aae16d..9546c64e4121ba6eb574eebcc3cf0338b4c2207d 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -212,6 +212,7 @@ struct _PrefsCommon
 
 extern PrefsCommon prefs_common;
 
+void prefs_common_init         ();
 void prefs_common_read_config  (void);
 void prefs_common_save_config  (void);
 void prefs_common_open         (void);