feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add nullptr checks in ActionEditor

Browse Source 
Encountered an odd nullptr in QmlJS::Value *value.

Change-Id: I9140ee15f01a430477b808aa7b664f5c40889c30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Aleksei German
2022-12-01 19:05:21 +01:00
parent d9054d1f10
commit 44cfc4a8cd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmldesigner/components/bindingeditor/actioneditor.cpp
View File

@@ -132,8 +132,7 @@ bool isLiteral(QmlJS::AST::Node *ast)
|| QmlJS::AST::cast<QmlJS::AST::TrueLiteral *>(ast) || QmlJS::AST::cast<QmlJS::AST::TrueLiteral *>(ast)
|| QmlJS::AST::cast<QmlJS::AST::FalseLiteral *>(ast)) || QmlJS::AST::cast<QmlJS::AST::FalseLiteral *>(ast))
return true; return true;
else return false;
return false;
} }
TypeName skipCpp(TypeName typeName) TypeName skipCpp(TypeName typeName)
@@ -229,16 +228,18 @@ void ActionEditor::prepareConnections()
QmlJS::AST::ExpressionNode *expression = newDoc->expression(); QmlJS::AST::ExpressionNode *expression = newDoc->expression();
if (expression && !isLiteral(expression)) { if (expression && !isLiteral(expression)) {
QmlJS::ValueOwner *interp = context->valueOwner(); if (QmlJS::ValueOwner *interp = context->valueOwner()) {
const QmlJS::Value *value = interp->convertToObject(scopeChain.evaluate(expression)); if (const QmlJS::Value *value = interp->convertToObject(
scopeChain.evaluate(expression))) {
if (value->asNullValue() && !methodBlackList.contains(slotName))
connection.methods.append(QString::fromUtf8(slotName));
if (value->asNullValue() && !methodBlackList.contains(slotName)) if (const QmlJS::FunctionValue *f = value->asFunctionValue()) {
connection.methods.append(QString::fromUtf8(slotName)); // Only add slots with zero arguments
if (f->namedArgumentCount() == 0 && !methodBlackList.contains(slotName))
if (const QmlJS::FunctionValue *f = value->asFunctionValue()) { connection.methods.append(QString::fromUtf8(slotName));
// Only add slots with zero arguments }
if (f->namedArgumentCount() == 0 && !methodBlackList.contains(slotName)) }
connection.methods.append(QString::fromUtf8(slotName));
} }
} }
} }