diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-16 13:34:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-16 18:48:59 +0200 |
| commit | 8559bf934def636ccff487464adb600d219f8778 (patch) | |
| tree | 3063152f487798c7103dbf61216e48c37586a4e1 /src/corelib/serialization | |
| parent | f1a6b97fe2d3eda9455b13bb79828f250d46b92e (diff) | |
| parent | a0ebd98f58b2d92c34fafbc620f024caa36bf0ad (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I4af138ffb2f5306373244523768209e8873b2798
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qxmlstream_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index 4157fbbd0e..f8b1ede943 100644 --- a/src/corelib/serialization/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h @@ -1250,7 +1250,7 @@ bool QXmlStreamReaderPrivate::parse() state_stack[tos] = 0; return true; } else if (act > 0) { - if (++tos == stack_size-1) + if (++tos >= stack_size-1) reallocateStack(); Value &val = sym_stack[tos]; |