From f689f322598e0115befba84a74a89223849fde23 Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Tue, 13 Apr 2021 10:09:50 +0100
Subject: [PATCH] Fixed make_string sizes

---
 include/etl/string.h    | 4 ++--
 include/etl/u16string.h | 4 ++--
 include/etl/u32string.h | 4 ++--
 include/etl/wstring.h   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/etl/string.h b/include/etl/string.h
index 85d892b2..90ac08d2 100644
--- a/include/etl/string.h
+++ b/include/etl/string.h
@@ -477,7 +477,7 @@ namespace etl
   template<size_t ARRAY_SIZE>
   etl::string<ARRAY_SIZE - 1> make_string(const char(&text)[ARRAY_SIZE])
   {
-    return etl::string<ARRAY_SIZE - 1>(text, ARRAY_SIZE - 1);
+    return etl::string<ARRAY_SIZE - 1>(text, etl::strlen(text));
   }
 
   //***************************************************************************
@@ -486,7 +486,7 @@ namespace etl
   template<const size_t MAX_SIZE, const size_t SIZE>
   etl::string<MAX_SIZE> make_string_with_capacity(const char(&text)[SIZE])
   {
-    return etl::string<MAX_SIZE>(text, SIZE - 1);
+    return etl::string<MAX_SIZE>(text, etl::strlen(text));
   }
 }
 
diff --git a/include/etl/u16string.h b/include/etl/u16string.h
index 4e9e1760..d0812d35 100644
--- a/include/etl/u16string.h
+++ b/include/etl/u16string.h
@@ -460,7 +460,7 @@ namespace etl
   template<size_t ARRAY_SIZE>
   etl::u16string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1> make_string(const char16_t(&text)[ARRAY_SIZE])
   {
-    return etl::u16string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, ARRAY_SIZE - 1);
+    return etl::u16string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, etl::strlen(text));
   }
 
   //***************************************************************************
@@ -469,7 +469,7 @@ namespace etl
   template<const size_t MAX_SIZE, const size_t SIZE>
   etl::u16string<MAX_SIZE> make_string_with_capacity(const char16_t(&text)[SIZE])
   {
-    return etl::u16string<MAX_SIZE>(text, SIZE - 1);
+    return etl::u16string<MAX_SIZE>(text, etl::strlen(text));
   }
 }
 
diff --git a/include/etl/u32string.h b/include/etl/u32string.h
index 7c621887..8d7903d8 100644
--- a/include/etl/u32string.h
+++ b/include/etl/u32string.h
@@ -460,7 +460,7 @@ namespace etl
   template<size_t ARRAY_SIZE>
   etl::u32string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1> make_string(const char32_t(&text)[ARRAY_SIZE])
   {
-    return etl::u32string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, ARRAY_SIZE - 1);
+    return etl::u32string<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, etl::strlen(text));
   }
 
   //***************************************************************************
@@ -469,7 +469,7 @@ namespace etl
   template<const size_t MAX_SIZE, const size_t SIZE>
   etl::u32string<MAX_SIZE> make_string_with_capacity(const char32_t(&text)[SIZE])
   {
-    return etl::u32string<MAX_SIZE>(text, SIZE - 1);
+    return etl::u32string<MAX_SIZE>(text, etl::strlen(text));
   }
 }
 
diff --git a/include/etl/wstring.h b/include/etl/wstring.h
index 2e8c91fb..8a78de7a 100644
--- a/include/etl/wstring.h
+++ b/include/etl/wstring.h
@@ -460,7 +460,7 @@ namespace etl
   template<size_t ARRAY_SIZE>
   etl::wstring<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1> make_string(const wchar_t(&text)[ARRAY_SIZE])
   {
-    return etl::wstring<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, ARRAY_SIZE - 1);
+    return etl::wstring<ARRAY_SIZE == 1 ? 1 : ARRAY_SIZE - 1>(text, etl::strlen(text));
   }
 
   //***************************************************************************
@@ -469,7 +469,7 @@ namespace etl
   template<const size_t MAX_SIZE, const size_t SIZE>
   etl::wstring<MAX_SIZE> make_string_with_capacity(const wchar_t(&text)[SIZE])
   {
-    return etl::wstring<MAX_SIZE>(text, SIZE - 1);
+    return etl::wstring<MAX_SIZE>(text, etl::strlen(text));
   }
 }