* src/folder.c

        add extra check if fetching the msginfo
        returned NULL

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3287b1db648802d5b9f1d0641e75a4c48b937ea8..bb5512ff468e82aea1ae26ecfc171aa6ac168d94 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-27 [christoph] 0.8.0claws23
+
+       * src/folder.c
+               add extra check if fetching the msginfo
+               returned NULL
+
 2002-07-27 [paul]      0.8.0claws22
 
        * sync with 0.8.1cvs2

diff --git a/configure.in b/configure.in
index 512563131b68984ba90f611559eba65a64b6af2e..703b1bd8395ecc07f25cdbd0233f9a46cae8c9ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws23
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 291595e2fb4cd1d9d83890a5d1b9ced30bd543be..96f0f7f03a04d860336953c0ca79bb6a04fe5adf 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1283,15 +1283,19 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
         if (num > 0) {
                msginfo = folder->fetch_msginfo(folder, dest, num);
 
-               if(MSG_IS_NEW(msginfo->flags))
-                       dest->new++;
-               if(MSG_IS_UNREAD(msginfo->flags))
-                       dest->unread++;
-               dest->total++;
+               if(msginfo != NULL) {
+                       if(MSG_IS_NEW(msginfo->flags))
+                               dest->new++;
+                       if(MSG_IS_UNREAD(msginfo->flags))
+                               dest->unread++;
+                       dest->total++;
+
+                       msgcache_add_msg(dest->cache, msginfo);
+
+                       procmsg_msginfo_free(msginfo);
+               }
 
                 dest->last_num = num;
-                msgcache_add_msg(dest->cache, msginfo);
-               procmsg_msginfo_free(msginfo);
         }
 
        return num;