fix memory corruption in folderitem's prefs

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d3f3b0f3c0a6756778c70e9751618313d5a611e8..35d87a8d26893c071563364bd998a8627ee1401e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-08-07 [colin]     0.9.12cvs48
+
+       * src/prefs_folder_item.c
+               fix memory corruption in folderitem's prefs
+
 2004-08-06 [colin]     0.9.12cvs47
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index b8a08ffe30c028aa5e2d6d3ee689af70cd6b691d..770522fb7e8b7e5f0670ad4cc6301785f810ab72 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -29,3 +29,4 @@
 ( cvs diff -u -r 1.120 -r 1.121 AUTHORS; cvs diff -u -r 1.50 -r 1.51 po/pt_BR.po; ) > 0.9.12cvs40.patchset
 ( cvs diff -u -r 1.439 -r 1.440 ChangeLog; cvs diff -u -r 1.434 -r 1.435 ChangeLog.jp; cvs diff -u -r 1.204 -r 1.205 src/imap.c; cvs diff -u -r 1.116 -r 1.117 src/news.c; cvs diff -u -r 1.10 -r 1.11 src/common/nntp.c; cvs diff -u -r 1.25 -r 1.26 src/common/session.c; cvs diff -u -r 1.10 -r 1.11 src/common/session.h; cvs diff -u -r 1.13 -r 1.14 src/common/socket.c; ) > 0.9.12cvs43.patchset
 ( cvs diff -u -r 1.431 -r 1.432 src/compose.c; ) > 0.9.12cvs47.patchset
+( cvs diff -u -r 1.62 -r 1.63 src/prefs_folder_item.c; ) > 0.9.12cvs48.patchset

diff --git a/configure.ac b/configure.ac
index e89fb0d0e813769cbcbded25254377462692b181..b767216edb2f406277d8bf48a0a01ebfa0a79a32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index f3e50ce52d0500269fa333c4cb9e43387a1f279b..9b52af6f5002c4760ac1b64aabce6f2e9120d099 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -763,12 +763,12 @@ FolderItemGeneralPage folder_item_general_page;
 
 static void register_general_page()
 {
-       gchar *path[2];
+       static gchar *pfi_general_path[2];
 
-       path[0] = _("General");
-       path[1] = NULL;
+       pfi_general_path[0] = _("General");
+       pfi_general_path[1] = NULL;
 
-        folder_item_general_page.page.path = path;
+        folder_item_general_page.page.path = pfi_general_path;
         folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
         folder_item_general_page.page.destroy_widget = prefs_folder_item_general_destroy_widget_func;
         folder_item_general_page.page.save_page = prefs_folder_item_general_save_func;
@@ -780,12 +780,12 @@ FolderItemComposePage folder_item_compose_page;
 
 static void register_compose_page(void)
 {
-       gchar *path[2];
+       static gchar *pfi_compose_path[2];
 
-       path[0] = _("Compose");
-       path[1] = NULL;
+       pfi_compose_path[0] = _("Compose");
+       pfi_compose_path[1] = NULL;
 
-        folder_item_compose_page.page.path = path;
+        folder_item_compose_page.page.path = pfi_compose_path;
         folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
         folder_item_compose_page.page.destroy_widget = prefs_folder_item_compose_destroy_widget_func;
         folder_item_compose_page.page.save_page = prefs_folder_item_compose_save_func;