test: improve test_mutt_buffer_len()

diff --git a/mutt/buffer.c b/mutt/buffer.c
index eadd258159f525d2340e446c926eeb6ce0ee0616..c14d4fa16a79f27a69781bcf25d5630e6879670f 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -369,7 +369,7 @@ void mutt_buffer_increase_size(struct Buffer *buf, size_t new_size)
  */
 size_t mutt_buffer_len(const struct Buffer *buf)
 {
-  if (!buf)
+  if (!buf || !buf->data || !buf->dptr)
     return 0;
 
   return buf->dptr - buf->data;

diff --git a/test/buffer/mutt_buffer_len.c b/test/buffer/mutt_buffer_len.c
index df8640753b50501ac6038395c072e5fc6ac0384d..e763c1cd9e861ee015478859176e1dc8092576df 100644 (file)
--- a/test/buffer/mutt_buffer_len.c
+++ b/test/buffer/mutt_buffer_len.c
@@ -32,4 +32,16 @@ void test_mutt_buffer_len(void)
   {
     TEST_CHECK(mutt_buffer_len(NULL) == 0);
   }
+
+  {
+    struct Buffer *buf = mutt_buffer_new();
+    TEST_CHECK(mutt_buffer_len(buf) == 0);
+    mutt_buffer_free(&buf);
+  }
+
+  {
+    struct Buffer *buf = mutt_buffer_from("test");
+    TEST_CHECK(mutt_buffer_len(buf) != 0);
+    mutt_buffer_free(&buf);
+  }
 }