From 2cf503d0e96b73fc10654d574720c8104acf2418 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 23 Nov 2019 03:53:46 +0000 Subject: [PATCH] fix possible crash in QMetaType::isRegistered() Signed-off-by: Ivailo Monev --- src/core/kernel/qmetatype.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/kernel/qmetatype.cpp b/src/core/kernel/qmetatype.cpp index 9a4c9fdfe..d4b427617 100644 --- a/src/core/kernel/qmetatype.cpp +++ b/src/core/kernel/qmetatype.cpp @@ -574,10 +574,12 @@ bool QMetaType::isRegistered(int type) if (type >= 0 && type < User) { // predefined type return true; + } else if (type < 0) { + return false; } QReadLocker locker(customTypesLock()); const QVector * const ct = customTypes(); - return ((ct && ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty()); + return (ct && (ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty()); } /*! -- 2.11.0