Fix invalid pointer arithmetic.

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 589c6463dcad8d8fd8de78d4fcce9817a7140d43..a8d142021f002916d01282fd670a1a9d5fe2631e 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -24,6 +24,7 @@
 #include <h/mh.h>                              /* mh internals */
 #include "lock_file.h"
 #include "m_maildir.h"
 #include <h/mh.h>                              /* mh internals */
 #include "lock_file.h"
 #include "m_maildir.h"

+#include "makedir.h"

 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 void


@@ -52,8 +53,7 @@ context_read (void)
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");

-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;

     }
 
     /*
     }
 
     /*


@@ -140,7 +140,7 @@ context_read (void)
     ctxpath = getcpy (m_maildir (cp));
 
     if ((ib = lkfopendata (ctxpath, "r", &failed_to_lock))) {
     ctxpath = getcpy (m_maildir (cp));
 
     if ((ib = lkfopendata (ctxpath, "r", &failed_to_lock))) {

-       readconfig ((struct node **) 0, ib, cp, 1);
+       readconfig(NULL, ib, cp, 1);

        lkfclosedata (ib, ctxpath);
     }
 }
        lkfclosedata (ib, ctxpath);
     }
 }