0.8.10claws77

* src/summaryview.c
* src/common/utils.c
        fix segfault when opening the root news folder

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4c1230d3c1a43fdf59064780ea4d0c7fa5b2c4d6..dfcedc54aaf80d18c761cac6c02d4547c0e27403 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-03-03 [christoph] 0.8.10claws77
+
+       * src/summaryview.c
+       * src/common/utils.c
+               fix segfault when opening the root news folder
+
 2003-03-03 [christoph] 0.8.10claws76
 
        * src/mainwindow.[ch]

diff --git a/configure.ac b/configure.ac
index a4f5917d9065d1856ea5d68f03d899c6bcd81752..e334ba2aca267a45db054e16f4b881a3b7996dd3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws76
+EXTRA_VERSION=claws77
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/common/utils.c b/src/common/utils.c
index 0cd9ba6d0b6ab735bc88f061d66d0d33ad3a1844..24e153dc319b177cb8430064daac848c1ce3d2f2 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1249,6 +1249,8 @@ gchar *get_abbrev_newsgroup_name(const gchar *group, gint len)
        const gchar *p = group;
        const gchar *last;
 
+       g_return_val_if_fail(group != NULL, NULL);
+
        last = group + strlen(group);
        abbrev_group = ap = g_malloc(strlen(group) + 1);
 

diff --git a/src/summaryview.c b/src/summaryview.c
index ef80a15ad7e8fa73a0ae0f9d8317cbba10429bf6..b334ec98f4f4ec50b2eec6612c5352cec07f1243 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1934,12 +1934,16 @@ static void summary_status_show(SummaryView *summaryview)
        }
 
        if (summaryview->folder_item->folder->type == F_NEWS) {
-               gchar *group;
-               group = get_abbrev_newsgroup_name
-                       (g_basename(summaryview->folder_item->path),
-                        prefs_common.ng_abbrev_len);
-               gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
-               g_free(group);
+               if (summaryview->folder_item->path != NULL) {
+                       gchar *group;
+                       group = get_abbrev_newsgroup_name
+                               (g_basename(summaryview->folder_item->path),
+                                prefs_common.ng_abbrev_len);
+                       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
+                       g_free(group);
+               } else {
+                       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
+               }
        } else {
                gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
                              summaryview->folder_item->path);