Skip to content
Snippets Groups Projects
Commit 510713b9 authored by James Crook's avatar James Crook
Browse files

Merge remote-tracking branch 'leland/master'

parents eaa19730 f434789f
No related branches found
No related tags found
No related merge requests found
......@@ -457,7 +457,7 @@ void AutoSaveFile::WriteAttr(const wxString & name, const wxString & value)
mBuffer.PutC(FT_String);
WriteName(name);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.c_str(), len);
......@@ -525,7 +525,7 @@ void AutoSaveFile::WriteData(const wxString & value)
{
mBuffer.PutC(FT_Data);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.c_str(), len);
......@@ -535,7 +535,7 @@ void AutoSaveFile::Write(const wxString & value)
{
mBuffer.PutC(FT_Raw);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.c_str(), len);
......@@ -595,6 +595,7 @@ void AutoSaveFile::CheckSpace(wxMemoryOutputStream & os)
void AutoSaveFile::WriteName(const wxString & name)
{
wxASSERT(name.Length() * sizeof(wxChar) <= SHRT_MAX);
short len = name.Length() * sizeof(wxChar);
short id;
......@@ -771,7 +772,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_String:
{
short len;
int len;
in.Read(&id, sizeof(id));
in.Read(&len, sizeof(len));
......@@ -866,7 +867,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_Data:
{
short len;
int len;
in.Read(&len, sizeof(len));
wxChar *val = new wxChar[len / sizeof(wxChar)];
......@@ -879,7 +880,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_Raw:
{
short len;
int len;
in.Read(&len, sizeof(len));
wxChar *val = new wxChar[len / sizeof(wxChar)];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment