From 03de9ff7eefd9e635d16867c231153363acfdf4b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 14 Mar 2022 11:17:18 -0700 Subject: [PATCH] QJsonValueConstRef: fix null pointer dereferences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduced in commit 705ea62f9e08730793adc7f6cec753c88e66ac4e, but apparently these constructors aren't used anywhere yet. Change-Id: Ic30914a4448d4bc28974fffd16dc521ab49d3be4 Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- src/corelib/serialization/qjsonarray.h | 2 +- src/corelib/serialization/qjsonobject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 20109dfbf31..ce57b0babc1 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -271,7 +271,7 @@ Q_DECLARE_SHARED(QJsonArray) #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) inline QJsonValueConstRef::QJsonValueConstRef(QJsonArray *a, qsizetype idx) - : d(a->a.data()), is_object(false), index(idx) + : d(a ? a->a.data() : nullptr), is_object(false), index(idx) {} #endif diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 573d526dff7..3d22e184b58 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -313,7 +313,7 @@ Q_DECLARE_SHARED(QJsonObject) #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) inline QJsonValueConstRef::QJsonValueConstRef(QJsonObject *o, qsizetype idx) - : d(o->o.data()), is_object(true), index(idx) + : d(o ? o->o.data() : nullptr), is_object(true), index(idx) {} #endif