From f697530574dc8b9bb89abf444d528587a4bd4196 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Mon, 23 May 2022 14:35:44 +0100 Subject: [PATCH 1/2] Sanitizers: Fix logic setting up memory sanitizer --- cmake/Sanitizers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake index f6d658cf0..b7e02c2ff 100644 --- a/cmake/Sanitizers.cmake +++ b/cmake/Sanitizers.cmake @@ -27,7 +27,7 @@ function(enable_sanitizers project_name) endif() option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF) - if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + if(ENABLE_SANITIZER_MEMORY AND (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")) message(WARNING "Memory sanitizer requires all the code (including libc++) to be MSan-instrumented otherwise it reports false positives") if("address" IN_LIST SANITIZERS OR "thread" IN_LIST SANITIZERS From d600d3acb8fe2901102d9897cc8f7d01019f06a8 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Mon, 23 May 2022 11:35:56 -0700 Subject: [PATCH 2/2] nodeparamview: fix null receiver warning --- app/widget/nodeparamview/nodeparamviewitem.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp index 05e9fe932..9c4e2d1fc 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.cpp +++ b/app/widget/nodeparamview/nodeparamviewitem.cpp @@ -83,7 +83,7 @@ void NodeParamViewItem::Retranslate() void NodeParamViewItem::RecreateBody() { - QWidget *old_body = body_; + delete body_; body_ = new NodeParamViewItemBody(node_, create_checkboxes_); connect(body_, &NodeParamViewItemBody::RequestSelectNode, this, &NodeParamViewItem::RequestSelectNode); @@ -95,8 +95,6 @@ void NodeParamViewItem::RecreateBody() body_->SetTime(time_); body_->SetTimebase(timebase_); SetBody(body_); - - old_body->deleteLater(); } int NodeParamViewItem::GetElementY(const NodeInput &c) const