diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-01-21 15:45:05 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-01-21 15:45:05 (GMT) |
| commit | 38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f (patch) | |
| tree | a61d4a3b99c0c419b15cb7f3cd82bfbc6caab601 /src/declarative/qml/parser | |
| parent | 1927af29ab140d9964aba337f218d87d9ce8c896 (diff) | |
| download | Qt-38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f.zip Qt-38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f.tar.gz Qt-38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f.tar.bz2 | |
Fixed possible array index-out-of-bounds crash in error reporting.
Diffstat (limited to 'src/declarative/qml/parser')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 7 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 7fbb3f6..90949d5 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -2985,7 +2985,12 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; token_buffer[1].loc = yylloc = location(lexer); if (t_action(errorState, yytoken)) { - const QString msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token_buffer[0].token])); + QString msg; + int token = token_buffer[0].token; + if (token < 0 || token >= TERMINAL_COUNT) + msg = qApp->translate("QmlParser", "Syntax error"); + else + msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg)); action = errorState; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index c2788f4..856d06d 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -1761,7 +1761,12 @@ case 340: { token_buffer[1].loc = yylloc = location(lexer); if (t_action(errorState, yytoken)) { - const QString msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token_buffer[0].token])); + QString msg; + int token = token_buffer[0].token; + if (token < 0 || token >= TERMINAL_COUNT) + msg = qApp->translate("QmlParser", "Syntax error"); + else + msg = qApp->translate("QmlParser", "Unexpected token `%1'").arg(QLatin1String(spell[token])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg)); action = errorState; |