diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 14:20:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 14:20:43 (GMT) |
| commit | ab5c902908861a084f60bc1bceba8a98289ce723 (patch) | |
| tree | 8a7b5b62790707531fc05b109239314ad1bcb8cc /src | |
| parent | d9c096ac73f86e321060e379a0df449bed1df310 (diff) | |
| parent | 0948393df9b9046db5c3c92a12698aee056d8483 (diff) | |
| download | Qt-ab5c902908861a084f60bc1bceba8a98289ce723.zip Qt-ab5c902908861a084f60bc1bceba8a98289ce723.tar.gz Qt-ab5c902908861a084f60bc1bceba8a98289ce723.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]; |