Some off-by-ones

mridgers · Jun 15, 2023 · 3f59046 · 3f59046
1 parent a385a16
commit 3f59046
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/clink/core/include/core/str.h b/clink/core/include/core/str.h
@@ -324,7 +324,7 @@ StrImpl<TYPE>& StrImpl<TYPE>::operator << (const TYPE* rhs)
 template <typename TYPE> template <int32 I>
 StrImpl<TYPE>& StrImpl<TYPE>::operator << (const TYPE (&rhs)[I])
 {
-    concat(rhs, I);
+    concat(rhs, I - 1);
     return *this;
 }
 
@@ -357,7 +357,7 @@ int32 to_utf16(wchar_t* out, int32 max_count, StrIterImpl<char>& iter);
 class StrBase : public StrImpl<char>
 {
 public:
-    template <int32 I> StrBase(char (&data)[I]) : StrImpl<char>(data, I) {}
+    template <int32 I>  StrBase(char (&data)[I]) : StrImpl<char>(data, I - 1) {}
                      StrBase(char* data, int32 size) : StrImpl<char>(data, size) {}
                      StrBase(const StrBase&)          = delete;
                      StrBase(const StrBase&&)         = delete;
@@ -370,7 +370,7 @@ class StrBase : public StrImpl<char>
 class WstrBase : public StrImpl<wchar_t>
 {
 public:
-    template <int32 I> WstrBase(char (&data)[I]) : StrImpl<wchar_t>(data, I) {}
+    template <int32 I>  WstrBase(char (&data)[I]) : StrImpl<wchar_t>(data, I - 1) {}
                      WstrBase(wchar_t* data, int32 size) : StrImpl<wchar_t>(data, size) {}
                      WstrBase(const WstrBase&)         = delete;
                      WstrBase(const WstrBase&&)        = delete;

diff --git a/clink/terminal/include/terminal/printer.h b/clink/terminal/include/terminal/printer.h
@@ -44,5 +44,5 @@ template <int32 S> void Printer::print(const char (&data)[S])
 //------------------------------------------------------------------------------
 template <int32 S> void Printer::print(const Attributes attr, const char (&data)[S])
 {
-    print(attr, data, S);
+    print(attr, data, S - 1);
 }
diff --git a/clink/terminal/include/terminal/terminal_out.h b/clink/terminal/include/terminal/terminal_out.h
@@ -22,5 +22,5 @@ class TerminalOut
 //------------------------------------------------------------------------------
 template <int32 S> void TerminalOut::write(const char (&chars)[S])
 {
-    write(chars, S);
+    write(chars, S - 1);
 }