fix: improve function checks

diff --git a/address/address.c b/address/address.c
index d7f1c634d9f3dc3e56f6679699d1a93645ccaa31..190299626fc98c7d3edfa6edee1ea8b4c4fb271a 100644 (file)
--- a/address/address.c
+++ b/address/address.c
@@ -1228,7 +1228,7 @@ int mutt_addrlist_to_intl(struct AddressList *al, char **err)
 /**
  * mutt_addr_to_local - Convert an Address from Punycode
  * @param a Address to convert
- * @param bool True on success, false otherwise
+ * @retval bool True on success, false otherwise
  */
 bool mutt_addr_to_local(struct Address *a)
 {

diff --git a/hdrline.c b/hdrline.c
index 1ccb3fa0fa38edcb3b9f6e7874a4b6d057c8616c..19a3a5f56badbcb0aed8117c883425d76bd24a24 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -570,13 +570,14 @@ static const char *index_format_str(char *buf, size_t buflen, size_t col, int co
   struct Context *ctx = hfi->ctx;
   struct Mailbox *m = hfi->mailbox;
 
+  if (!e || !e->env)
+    return src;
+
   const struct Address *reply_to = TAILQ_FIRST(&e->env->reply_to);
   const struct Address *from = TAILQ_FIRST(&e->env->from);
   const struct Address *to = TAILQ_FIRST(&e->env->to);
   const struct Address *cc = TAILQ_FIRST(&e->env->cc);
 
-  if (!e || !e->env)
-    return src;
   buf[0] = '\0';
   switch (op)
   {

diff --git a/mutt/buffer.c b/mutt/buffer.c
index e18a041fee46721c567e9842632e3296b9cfd670..68142657fb14d525c7b58928fca0f6a70035a516 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -76,7 +76,7 @@ struct Buffer *mutt_buffer_init(struct Buffer *buf)
  */
 void mutt_buffer_reset(struct Buffer *buf)
 {
-  if (!buf)
+  if (!buf || !buf->data || (buf->dsize == 0))
     return;
   memset(buf->data, 0, buf->dsize);
   buf->dptr = buf->data;