PVS: V1004 A pointer was used unsafely after it was verified against nullptr

This commit is contained in:
wmayer
2020-07-17 14:26:29 +02:00
parent 9ee3cd222b
commit 9424395afc
6 changed files with 14 additions and 11 deletions

View File

@@ -699,7 +699,7 @@ void DocumentObject::onChanged(const Property* prop)
return;
if(!GetApplication().isRestoring() &&
prop && !prop->testStatus(Property::PartialTrigger) &&
!prop->testStatus(Property::PartialTrigger) &&
getDocument() &&
getDocument()->testStatus(Document::PartialDoc))
{

View File

@@ -73,7 +73,6 @@ DlgObjectSelection::DlgObjectSelection(
info.depItem = new QTreeWidgetItem(ui->depList);
auto vp = Gui::Application::Instance->getViewProvider(obj);
if(vp) info.depItem->setIcon(0, vp->getIcon());
info.depItem->setIcon(0, vp->getIcon());
info.depItem->setText(0, QString::fromUtf8((obj)->Label.getValue()));
info.depItem->setText(1, QString::fromUtf8(obj->getDocument()->getName()));
info.depItem->setText(2, QString::fromLatin1(obj->getNameInDocument()));

View File

@@ -414,11 +414,11 @@ PyObject* ViewProviderPy::partialRender(PyObject* args)
#endif
else {
std::string error = std::string("type must be str or unicode");
if(item) {
if (item) {
error += " not, ";
error += item->ob_type->tp_name;
}
throw Base::TypeError(error + item->ob_type->tp_name);
throw Base::TypeError(error);
}
}
}

View File

@@ -1236,8 +1236,10 @@ void PartGui::DimensionAngular::setupDimension()
//text
SoSeparator *textSep = static_cast<SoSeparator *>(getPart("textSep", true));
if (textSep)
textSep->addChild(material);
if (!textSep)
return;
textSep->addChild(material);
SoCalculator *textVecCalc = new SoCalculator();
textVecCalc->a.connectFrom(&angle);

View File

@@ -1195,6 +1195,7 @@ int DrawViewPart::add1CVToGV(std::string tag)
TechDraw::CosmeticVertex* cv = getCosmeticVertex(tag);
if (cv == nullptr) {
Base::Console().Message("DVP::add1CVToGV 2 - cv %s not found\n", tag.c_str());
return 0;
}
int iGV = geometryObject->addCosmeticVertex(cv->scaled(getScale()),
cv->getTagAsString());

View File

@@ -154,11 +154,12 @@ void TaskProjGroup::saveGroupState()
m_saveSpacingY = multiView->spacingY.getValue();
DrawProjGroupItem* anchor = multiView->getAnchor();
m_saveDirection = anchor->Direction.getValue();
}
for( const auto it : multiView->Views.getValues() ) {
auto view( dynamic_cast<DrawProjGroupItem *>(it) );
if (view != nullptr) {
m_saveViewNames.push_back(view->Type.getValueAsString());
for( const auto it : multiView->Views.getValues() ) {
auto view( dynamic_cast<DrawProjGroupItem *>(it) );
if (view != nullptr) {
m_saveViewNames.push_back(view->Type.getValueAsString());
}
}
}
}