Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure the buffer is NULL-terminated before converting it.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-22 18:35:35 +00:00
parent 2548474612
commit 1c26fbe00e
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/src/stc/stc.cpp
View File

@@ -2547,8 +2547,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (len > 0) if (len > 0)
{ {
#if wxUSE_UNICODE #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); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer; wxString buffer;

3
contrib/src/stc/stc.cpp.in
View File

@@ -356,8 +356,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (len > 0) if (len > 0)
{ {
#if wxUSE_UNICODE #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); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer; wxString buffer;

3
src/stc/stc.cpp
View File

@@ -2547,8 +2547,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (len > 0) if (len > 0)
{ {
#if wxUSE_UNICODE #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); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer; wxString buffer;

3
src/stc/stc.cpp.in
View File

@@ -356,8 +356,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (len > 0) if (len > 0)
{ {
#if wxUSE_UNICODE #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); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer; wxString buffer;