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

fix a buffer overflow (#9596)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-25 12:48:40 +00:00
parent 1c8a2d1b92
commit 3bb1213dbe
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/tex2rtf/src/tex2any.cpp
View File

@@ -938,18 +938,23 @@ bool ParseNewCommand(wxChar *buffer, int *pos)
void MacroError(wxChar *buffer) void MacroError(wxChar *buffer)
{ {
wxString errBuf; wxString errBuf;
wxChar macroBuf[200]; wxChar macroBuf[30];
macroBuf[0] = '\\'; macroBuf[0] = wxT('\\');
int i = 1; int i = 1;
wxChar ch; wxChar ch;
while (((ch = buffer[i-1]) != '\n') && (ch != 0)) while (((i < 30) && (ch = buffer[i-1]) != wxT('\n')) && (ch != 0))
{ {
macroBuf[i] = ch; macroBuf[i] = ch;
i ++; i ++;
} }
macroBuf[i] = 0; macroBuf[i] = 0;
if (i > 20) if (i > 20)
macroBuf[20] = 0; {
macroBuf[20] = wxT('.');
macroBuf[21] = wxT('.');
macroBuf[22] = wxT('.');
macroBuf[23] = 0;
}
errBuf.Printf(_T("Could not find macro: %s at line %d, file %s"), errBuf.Printf(_T("Could not find macro: %s at line %d, file %s"),
macroBuf, (int)(LineNumbers[CurrentInputIndex]-1), FileNames[CurrentInputIndex]); macroBuf, (int)(LineNumbers[CurrentInputIndex]-1), FileNames[CurrentInputIndex]);