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

fix substr() calls broken by r56215 (#10198)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-20 18:19:17 +00:00
parent 5513d18ba7
commit 9c39f4f538
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xml/xml.cpp
View File

@@ -825,10 +825,11 @@ bool OutputStringEnt(wxOutputStream& stream,
{ {
wxChar c = str.GetChar(i); wxChar c = str.GetChar(i);
if (c == wxS('<') || c == wxS('>') || if (c == wxS('<') || c == wxS('>') ||
(c == wxS('&') && str.Mid(i+1, 4) != wxS("amp;")) || (c == wxS('&') && str.substr(i+1, 4) != wxS("amp;")) ||
((flags & XML_ESCAPE_QUOTES) && c == wxS('"'))) ((flags & XML_ESCAPE_QUOTES) && c == wxS('"')))
{ {
if ( !OutputString(stream, str.substr(last, i), convMem, convFile) ) if ( !OutputString(stream, str.substr(last, i - last),
convMem, convFile) )
return false; return false;
const char *escaped; const char *escaped;
@@ -858,7 +859,7 @@ bool OutputStringEnt(wxOutputStream& stream,
} }
} }
return OutputString(stream, str.substr(last, i), convMem, convFile); return OutputString(stream, str.substr(last, i - last), convMem, convFile);
} }
bool OutputIndentation(wxOutputStream& stream, bool OutputIndentation(wxOutputStream& stream,