Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/json/qjsonparser.cpp
	src/gui/opengl/qopengl.cpp

Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b

1 files changed, 4 insertions, 0 deletions

diff --git a/src/corelib/json/qjsonparser_p.h b/src/corelib/json/qjsonparser_p.h
index ceb366b0f8..920f265ca3 100644
--- a/src/corelib/json/qjsonparser_p.h
+++ b/src/corelib/json/qjsonparser_p.h
@@ -108,6 +108,10 @@ private:
         if (current + space >= dataLength) {
             dataLength = 2*dataLength + space;
             data = (char *)realloc(data, dataLength);
+            if (!data) {
+                lastError = QJsonParseError::DocumentTooLarge;
+                return -1;
+            }
         }
         int pos = current;
         current += space;