immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed CEdit delete[] issues

dev-ui
Piotr Dziwinski 2012-09-29 22:04:39 +02:00
parent 86109a8c1e
commit c8f39a4c96
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/edit.cpp
View File

@ -1483,7 +1483,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
FreeImage(); FreeImage();
if (m_text != nullptr) if (m_text != nullptr)
delete m_text; delete[] m_text;
m_text = new char[m_maxChar+1]; m_text = new char[m_maxChar+1];
memset(m_text, 0, m_maxChar+1); memset(m_text, 0, m_maxChar+1);
@ -1516,7 +1516,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
{ {
m_text[j] = buffer[i]; m_text[j] = buffer[i];
//if ( m_format.size() > 0 ) //if ( m_format.size() > 0 )
m_format[j] = font; m_format[j] = font;
j ++; j ++;
} }
i ++; i ++;
@ -1857,7 +1857,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
{ {
m_text[j] = buffer[i]; m_text[j] = buffer[i];
//if ( m_format.size() > 0 ) //if ( m_format.size() > 0 )
m_format[j] = font; m_format[j] = font;
j ++; j ++;
} }
i ++; i ++;
@ -1873,7 +1873,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
m_len = j; m_len = j;
m_imageTotal = iIndex; m_imageTotal = iIndex;
delete buffer; delete[] buffer;
Justif(); Justif();
ColumnFix(); ColumnFix();
@ -3320,8 +3320,8 @@ bool CEdit::SetFormat(int cursor1, int cursor2, int format)
for ( i=cursor1 ; i<cursor2 ; i++ ) for ( i=cursor1 ; i<cursor2 ; i++ )
{ {
if (m_format.count(i)) if (m_format.count(i))
m_format[i] |= format; m_format[i] |= format;
} }
return true; return true;