[bug #9813] Don't crash after removing the folder if the context file

has no Current-Folder entry.

diff --git a/ChangeLog b/ChangeLog
index 8679550e1181a4b9a47a4ae48f6bc650b841e23c..1ab8f4a0dd966199098970ef7927ba3c08427b6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
        it uses SASL if necessary. (This bug was preventing Bcc'd emails
        from being sent via SASL authenticated SMTP.)
 
        it uses SASL if necessary. (This bug was preventing Bcc'd emails
        from being sent via SASL authenticated SMTP.)
 

+       * bug #9813: uip/rmf.c: don't crash if there's no Current-Folder
+       entry in the context file.
+

 2005-11-13  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
        * bug #7833: uip/Makefile.in: remove link to install-mh that caused
 2005-11-13  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
        * bug #7833: uip/Makefile.in: remove link to install-mh that caused

diff --git a/uip/rmf.c b/uip/rmf.c
index 5fe47084b70d139763f2aac5fb933a497b02a73c..fb951ed08e1536bb7f51ee1f89381a7146ad249b 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -114,9 +114,12 @@ main (int argc, char **argv)
        free (cp);
     }
 
        free (cp);
     }
 

-    if (rmf (folder) == OK && strcmp (context_find (pfolder), newfolder)) {
-       printf ("[+%s now current]\n", newfolder);
-       context_replace (pfolder, newfolder);   /* update current folder */
+    if (rmf (folder) == OK) {
+       char *cfolder = context_find(pfolder);
+       if (cfolder && strcmp (cfolder, newfolder)) {
+           printf ("[+%s now current]\n", newfolder);
+           context_replace (pfolder, newfolder);       /* update current folder */
+       }

     }
     context_save ();   /* save the context file */
     return done (0);
     }
     context_save ();   /* save the context file */
     return done (0);