From 1c26fbe00e29543f772f31afbb8017c40bb5fd95 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 22 Mar 2004 18:35:35 +0000 Subject: [PATCH] Ensure the buffer is NULL-terminated before converting it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/stc.cpp | 3 ++- contrib/src/stc/stc.cpp.in | 3 ++- src/stc/stc.cpp | 3 ++- src/stc/stc.cpp.in | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp index d3e43c21a7..efedc9d763 100644 --- a/contrib/src/stc/stc.cpp +++ b/contrib/src/stc/stc.cpp @@ -2547,8 +2547,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename) if (len > 0) { #if wxUSE_UNICODE - wxMemoryBuffer buffer(len); + wxMemoryBuffer buffer(len+1); success = (file.Read(buffer.GetData(), len) == len); + ((char*)buffer.GetData())[len] = 0; contents = wxString(buffer, *wxConvCurrent); #else wxString buffer; diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in index 7459ffa401..473e08d38e 100644 --- a/contrib/src/stc/stc.cpp.in +++ b/contrib/src/stc/stc.cpp.in @@ -356,8 +356,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename) if (len > 0) { #if wxUSE_UNICODE - wxMemoryBuffer buffer(len); + wxMemoryBuffer buffer(len+1); success = (file.Read(buffer.GetData(), len) == len); + ((char*)buffer.GetData())[len] = 0; contents = wxString(buffer, *wxConvCurrent); #else wxString buffer; diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index d3e43c21a7..efedc9d763 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -2547,8 +2547,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename) if (len > 0) { #if wxUSE_UNICODE - wxMemoryBuffer buffer(len); + wxMemoryBuffer buffer(len+1); success = (file.Read(buffer.GetData(), len) == len); + ((char*)buffer.GetData())[len] = 0; contents = wxString(buffer, *wxConvCurrent); #else wxString buffer; diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index 7459ffa401..473e08d38e 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -356,8 +356,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename) if (len > 0) { #if wxUSE_UNICODE - wxMemoryBuffer buffer(len); + wxMemoryBuffer buffer(len+1); success = (file.Read(buffer.GetData(), len) == len); + ((char*)buffer.GetData())[len] = 0; contents = wxString(buffer, *wxConvCurrent); #else wxString buffer; -- 2.45.2