2005-05-05 [thorsten] 1.0.4cvs9

	* src/folder.c
		fix possible crash

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3c0261b514966943abdef4027aaea2f8044a70d6..83092c4af003f8d7ed8ad7962c2fcea676103bd7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2005-05-05 [thorsten]  1.0.4cvs9
+
+       * src/folder.c
+               fix possible crash
+

 2005-05-05 [paul]      1.0.4cvs8
 
        * AUTHORS
 2005-05-05 [paul]      1.0.4cvs8
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index 8ae9e434f7f7a7bf2e0379f6df232dbc56a05c64..e1937dff19113ec0f2fd4d60011e7df83bc016ad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -276,3 +276,4 @@
 ( cvs diff -u -r 1.65 -r 1.66 src/prefs_filtering.c; ) > 1.0.4cvs6.patchset
 ( cvs diff -u -r 1.483 -r 1.484 src/compose.c; cvs diff -u -r 1.259 -r 1.260 src/folderview.c; cvs diff -u -r 1.318 -r 1.319 src/mainwindow.c; cvs diff -u -r 1.136 -r 1.137 src/messageview.c; cvs diff -u -r 1.3 -r 1.4 src/partial_download.c; cvs diff -u -r 1.74 -r 1.75 src/pop.c; cvs diff -u -r 1.125 -r 1.126 src/prefs_account.c; cvs diff -u -r 1.233 -r 1.234 src/prefs_common.c; cvs diff -u -r 1.118 -r 1.119 src/prefs_common.h; cvs diff -u -r 1.66 -r 1.67 src/prefs_filtering.c; cvs diff -u -r 1.106 -r 1.107 src/procmime.c; cvs diff -u -r 1.18 -r 1.19 src/plugins/pgpmime/pgpmime.c; ) > 1.0.4cvs7.patchset
 ( cvs diff -u -r 1.131 -r 1.132 AUTHORS; cvs diff -u -r 1.484 -r 1.485 src/compose.c; ) > 1.0.4cvs8.patchset
 ( cvs diff -u -r 1.65 -r 1.66 src/prefs_filtering.c; ) > 1.0.4cvs6.patchset
 ( cvs diff -u -r 1.483 -r 1.484 src/compose.c; cvs diff -u -r 1.259 -r 1.260 src/folderview.c; cvs diff -u -r 1.318 -r 1.319 src/mainwindow.c; cvs diff -u -r 1.136 -r 1.137 src/messageview.c; cvs diff -u -r 1.3 -r 1.4 src/partial_download.c; cvs diff -u -r 1.74 -r 1.75 src/pop.c; cvs diff -u -r 1.125 -r 1.126 src/prefs_account.c; cvs diff -u -r 1.233 -r 1.234 src/prefs_common.c; cvs diff -u -r 1.118 -r 1.119 src/prefs_common.h; cvs diff -u -r 1.66 -r 1.67 src/prefs_filtering.c; cvs diff -u -r 1.106 -r 1.107 src/procmime.c; cvs diff -u -r 1.18 -r 1.19 src/plugins/pgpmime/pgpmime.c; ) > 1.0.4cvs7.patchset
 ( cvs diff -u -r 1.131 -r 1.132 AUTHORS; cvs diff -u -r 1.484 -r 1.485 src/compose.c; ) > 1.0.4cvs8.patchset

+( cvs diff -u -r 1.263 -r 1.264 src/folder.c; ) > 1.0.4cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 10d460876a5aa93f2e53d74e2d1427cd01ed2bea..70cd5e92385941eb39787de9f20d0f1314d608ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=8
+EXTRA_VERSION=9

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/folder.c b/src/folder.c
index 455e5755023ab8edfe303f35ec0724d9e3731f75..f3a7eaf27fadb879363ee0bce1b2b84061ef6c93 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1937,7 +1937,7 @@ void folder_clean_cache_memory(void)
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
 
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
 

-                       debug_print("Freeing cache memory for %s\n", item->path);
+                       debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);

                        memusage -= msgcache_get_memory_usage(item->cache);
                        folder_item_free_cache(item);
                        listitem = listitem->next;
                        memusage -= msgcache_get_memory_usage(item->cache);
                        folder_item_free_cache(item);
                        listitem = listitem->next;