From 57ec4514d4d1d64a7a2d0c585a173d2045e798be Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Sat, 30 Dec 2017 10:30:49 +0100
Subject: [PATCH] Fix bug detected by scan-build

---
 m-string.h           | 4 ++--
 tests/test-mstring.c | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/m-string.h b/m-string.h
index 14683715..5508af77 100644
--- a/m-string.h
+++ b/m-string.h
@@ -982,7 +982,7 @@ static inline size_t
 string_length_u(string_t str)
 {
   STRING_CONTRACT(str);
-  return stringi_utf8_length(str->ptr);
+  return stringi_utf8_length(string_get_cstr(str));
 }
 
 /* Check if a string is a valid UTF8 encoded stream */
@@ -990,7 +990,7 @@ static inline bool
 string_utf8_p(string_t str)
 {
   STRING_CONTRACT(str);
-  return stringi_utf8_valid_str_p(str->ptr);
+  return stringi_utf8_valid_str_p(string_get_cstr(str));
 }
 
 
diff --git a/tests/test-mstring.c b/tests/test-mstring.c
index 88fa549e..6a4dcbad 100644
--- a/tests/test-mstring.c
+++ b/tests/test-mstring.c
@@ -36,6 +36,9 @@ static void test_utf8_basic(void)
 {
   string_t s;
   string_init (s);
+
+  assert (string_utf8_p(s) == true);
+  assert (string_length_u(s) == 0);
   
   /* Test internal encode + decode for all characters */
   for (string_unicode_t i = 1; i < 0x10ffff; i++) {