diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 17:02:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 17:02:50 (GMT) |
| commit | db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d (patch) | |
| tree | 3327f1ddf2859df97b98265bd16472650e0e66a5 /src | |
| parent | 01c26e837617d494ecb06a11fc7c9eb628e1b75b (diff) | |
| parent | ab5c902908861a084f60bc1bceba8a98289ce723 (diff) | |
| download | Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.zip Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.tar.gz Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix crash in QXmlStreamReader
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/xml/qxmlstream.g | 2 | ||||
| -rw-r--r-- | src/corelib/xml/qxmlstream_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g index 1b882e0..e91408f 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/xml/qxmlstream.g @@ -748,7 +748,7 @@ bool QXmlStreamReaderPrivate::parse() state_stack[tos] = 0; return true; } else if (act > 0) { - if (++tos == stack_size) + if (++tos == stack_size-1) reallocateStack(); Value &val = sym_stack[tos]; diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h index ac421cf..f6ab3a1 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/xml/qxmlstream_p.h @@ -61,7 +61,7 @@ class QXmlStreamReader_Table { public: - enum { + enum VariousConstants { EOF_SYMBOL = 0, AMPERSAND = 5, ANY = 41, @@ -1242,7 +1242,7 @@ bool QXmlStreamReaderPrivate::parse() state_stack[tos] = 0; return true; } else if (act > 0) { - if (++tos == stack_size) + if (++tos == stack_size-1) reallocateStack(); Value &val = sym_stack[tos]; |