From: Vadim Zeitlin Date: Sun, 15 Jun 2008 12:08:52 +0000 (+0000) Subject: fix off by 1 error in GetTextRaw() (#4317) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/949750de631b2c2ee59c6e9080e7d38fa66c0167 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 66f161d26f..bfa51d3001 100644 --- 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 9ce33cd2a6..45f5db364b 100644 --- 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; }