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

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index d3e43c21a74287d861ac9fe015956be1b5b6b6e0..efedc9d76350fa24c6c61a6834d91f57748998dd 100644 (file)
--- 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
         if (len > 0)
         {
 #if wxUSE_UNICODE

-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);

             success = (file.Read(buffer.GetData(), len) == len);
             success = (file.Read(buffer.GetData(), len) == len);

+            ((char*)buffer.GetData())[len] = 0;

             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index 7459ffa401ed44758d28da62f1087e280ba8effd..473e08d38ef3552af69848f652e2cc4fbc918b7c 100644 (file)
--- 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
         if (len > 0)
         {
 #if wxUSE_UNICODE

-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);

             success = (file.Read(buffer.GetData(), len) == len);
             success = (file.Read(buffer.GetData(), len) == len);

+            ((char*)buffer.GetData())[len] = 0;

             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index d3e43c21a74287d861ac9fe015956be1b5b6b6e0..efedc9d76350fa24c6c61a6834d91f57748998dd 100644 (file)
--- 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
         if (len > 0)
         {
 #if wxUSE_UNICODE

-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);

             success = (file.Read(buffer.GetData(), len) == len);
             success = (file.Read(buffer.GetData(), len) == len);

+            ((char*)buffer.GetData())[len] = 0;

             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 7459ffa401ed44758d28da62f1087e280ba8effd..473e08d38ef3552af69848f652e2cc4fbc918b7c 100644 (file)
--- 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
         if (len > 0)
         {
 #if wxUSE_UNICODE

-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);

             success = (file.Read(buffer.GetData(), len) == len);
             success = (file.Read(buffer.GetData(), len) == len);

+            ((char*)buffer.GetData())[len] = 0;

             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;