Prevent crash if editfile() is called and both "*ed" and editsave

are NULL.  This can happen if you call "mime" and then run "edit" without
any arguments, if you're running whatnow standalone.

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index f0f9a2c58ce1b1735ce15de62000418cc9ff6d56..774d130c7c7eeead1a4c1fce1eba30f114f494c3 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -651,7 +651,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     int        slinked = 0;
 
     /* Was there a previous edit session? */
     int        slinked = 0;
 
     /* Was there a previous edit session? */

-    if (reedit) {
+    if (reedit && (*ed || edsave)) {

        if (!*ed) {             /* no explicit editor      */
            *ed = edsave;       /* so use the previous one */
            if ((cp = r1bindex (*ed, '/')) == NULL)
        if (!*ed) {             /* no explicit editor      */
            *ed = edsave;       /* so use the previous one */
            if ((cp = r1bindex (*ed, '/')) == NULL)