forward null checks

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index b9c8b7dc8016987488cbd5b6d9bfa013bdf4fb41..9bda6b7f4560c055c9f7d0a3f88eeb5820056346 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -823,7 +823,7 @@ static int tls_check_one_certificate(const gnutls_datum_t *certdata,
         break;
       case OP_MAX + 3: /* accept always */
         done = 0;
-        fp = fopen(CertificateFile, "a");
+        fp = mutt_file_fopen(CertificateFile, "a");
         if (fp)
         {
           /* save hostname if necessary */

diff --git a/curs_lib.c b/curs_lib.c
index 65042a9e387e1ac3fa6a2b12a8629dd473d57c67..0b8d2a65c3b89196d00140438eb81799f8200880 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -755,6 +755,9 @@ int mutt_window_mvprintw(struct MuttWindow *win, int row, int col, const char *f
  */
 void mutt_window_clrtoeol(struct MuttWindow *win)
 {
+  if (!win || !stdscr)
+    return;
+
   int row, col, curcol;
 
   if (win->col_offset + win->cols == COLS)

diff --git a/curs_main.c b/curs_main.c
index 94cee9f6c844e112756e86fe5d1320f2b8636f00..1a12583bbe97450fb09c1b8bdc9cb5d099eb99d9 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -708,7 +708,7 @@ void mutt_draw_statusline(int cols, const char *buf, int buflen)
     int last;
   } *syntax = NULL;
 
-  if (!buf)
+  if (!buf || !stdscr)
     return;
 
   do

diff --git a/menu.c b/menu.c
index dbe7df1ec090a1872980d111b6908d1d37c31295..cbc05f137385265881604eaecce9c528e00ffae3 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -104,6 +104,9 @@ static void print_enriched_string(int index, int attr, unsigned char *s, int do_
   size_t n = mutt_str_strlen((char *) s);
   mbstate_t mbstate;
 
+  if (!stdscr)
+    return;
+
   memset(&mbstate, 0, sizeof(mbstate));
   while (*s)
   {

diff --git a/mutt/file.c b/mutt/file.c
index 982a16dd3c9c79ee7f3f7b061f8695fb7da9fcfa..471b2b0bedf0e74bb3db9e47d45cf0d3ceecba86 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -555,6 +555,9 @@ int mutt_file_open(const char *path, int flags)
  */
 FILE *mutt_file_fopen(const char *path, const char *mode)
 {
+  if (!path || !mode)
+    return NULL;
+
   if (mode[0] == 'w')
   {
     int fd;