From 6256729a6da532079505edfe4c56a6ef29cd8ab8 Mon Sep 17 00:00:00 2001

From: Allan Sandfeld Jensen <allan.jensen@qt.io>

Date: Mon, 13 Aug 2018 15:29:16 +0200

Subject: [PATCH] Fix possible heap corruption in QXmlStream

The value of 'tos' at the check might already be on the last element,

so triggering stack expansion on the second last element is too late.

Change-Id: Ib3ab2662d4d27a71effe9e988b9e172923af2908

Reviewed-by: Richard J. Moore <rich@kde.org>

Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

---

 src/corelib/serialization/qxmlstream_p.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/src/corelib/xml/qxmlstream_p.h

+++ b/src/corelib/xml/qxmlstream_p.h

@@ -1242,7 +1242,7 @@

             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];