fix off by 1 error in GetTextRaw() (#4317)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 66f161d26fd42b1b581b12307d85543959d32dc7..bfa51d3001a173717f8a1a50d45808193f89bd2e 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -3691,9 +3691,9 @@ void wxStyledTextCtrl::SetTextRaw(const char* text)
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {
-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
+    int len = GetTextLength();
+    wxCharBuffer buf(len); // adds 1 for NUL automatically
+    SendMsg(SCI_GETTEXT, len + 1, (long)buf.data());
     return buf;
 }
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 9ce33cd2a6ce0c52988f7e050758ed323e98d4eb..45f5db364b0fd66096b8a210e05debb6f86244aa 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -694,9 +694,9 @@ void wxStyledTextCtrl::SetTextRaw(const char* text)
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {
-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
+    int len = GetTextLength();
+    wxCharBuffer buf(len); // adds 1 for NUL automatically
+    SendMsg(SCI_GETTEXT, len + 1, (long)buf.data());
     return buf;
 }