From: Thorsten Maerz Date: Thu, 5 May 2005 17:31:15 +0000 (+0000) Subject: 2005-05-05 [thorsten] 1.9.6cvs55 X-Git-Tag: rel_1_9_9~4 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4b98be1f3a5d2e58805eda2729c666332f1a037c 2005-05-05 [thorsten] 1.9.6cvs55 * src/folder.c fix possible crash --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 90d739692..297233564 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-05-05 [thorsten] 1.9.6cvs55 + + * src/folder.c + fix possible crash + 2005-05-05 [paul] 1.9.6cvs54 sync with HEAD diff --git a/PATCHSETS b/PATCHSETS index 3b81aee2f..994533da7 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -471,3 +471,4 @@ ( cvs diff -u -r 1.61.2.23 -r 1.61.2.24 src/account.c; cvs diff -u -r 1.5.10.8 -r 1.5.10.9 src/addrgather.c; cvs diff -u -r 1.2.4.6 -r 1.2.4.7 src/browseldap.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/exphtmldlg.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/expldifdlg.c; cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/importmutt.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/importpine.c; cvs diff -u -r 1.115.2.31 -r 1.115.2.32 src/main.c; cvs diff -u -r 1.274.2.35 -r 1.274.2.36 src/mainwindow.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/noticeview.c; cvs diff -u -r 1.59.2.16 -r 1.59.2.17 src/prefs_filtering.c; cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.17 -r 1.43.2.18 src/prefs_matcher.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_spelling.c; cvs diff -u -r 1.30.2.11 -r 1.30.2.12 src/prefs_toolbar.c; cvs diff -u -r 1.43.2.15 -r 1.43.2.16 src/toolbar.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/wizard.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/description_window.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/plugins/spamassassin/spamassassin_gtk.c; ) > 1.9.6cvs52.patchset ( cvs diff -u -r 1.274.2.36 -r 1.274.2.37 src/mainwindow.c; ) > 1.9.6cvs53.patchset ( cvs diff -u -r 1.100.2.16 -r 1.100.2.17 AUTHORS; cvs diff -u -r 1.382.2.119 -r 1.382.2.120 src/compose.c; ) > 1.9.6cvs54.patchset +( cvs diff -u -r 1.213.2.24 -r 1.213.2.25 src/folder.c; ) > 1.9.6cvs55.patchset diff --git a/configure.ac b/configure.ac index 223d5da28..73403c111 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=54 +EXTRA_VERSION=55 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index f404a76f4..c67f32fb6 100644 --- a/src/folder.c +++ b/src/folder.c @@ -1942,7 +1942,7 @@ void folder_clean_cache_memory(void) 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;