feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix read beyond end of input line

Browse Source 
a line ending in two backslashes would produce a literal backslash and
run off the end.

Task-number: QTCREATORBUG-3360
This commit is contained in:
Oswald Buddenhagen
2011-01-17 18:18:22 +01:00
parent f1d618ab5b
commit cef5754641
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/profileparser.cpp
View File

@@ -422,7 +422,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
} while (c == ' ' || c == '\t'); } while (c == ' ' || c == '\t');
forever { forever {
if (c == '$') { if (c == '$') {
if (*cur == '$') { // may be EOF, EOL, WS or '#' if past end if (*cur == '$') { // may be EOF, EOL, WS, '#' or '\\' if past end
cur++; cur++;
if (putSpace) { if (putSpace) {
putSpace = false; putSpace = false;
@@ -541,7 +541,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
xprPtr = ptr; xprPtr = ptr;
goto nextChr; goto nextChr;
} }
} else if (c == '\\') { } else if (c == '\\' && cur != end) {
static const char symbols[] = "[]{}()$\\'\""; static const char symbols[] = "[]{}()$\\'\"";
ushort c2 = *cur; ushort c2 = *cur;
if (!(c2 & 0xff00) && strchr(symbols, c2)) { if (!(c2 & 0xff00) && strchr(symbols, c2)) {