Skip to content

Commit 663948e

Browse files
committed
Fix nullptr dereferences found by gcc 11.4
Signed-off-by: Edward Lam <e4lam@yahoo.com>
1 parent 2d3eabc commit 663948e

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Convert.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ SOP_OpenVDB_Convert::Cache::referenceMeshing(
12061206
typename GridType::ConstPtr grid = openvdb::gridConstPtrCast<GridType>(*it);
12071207

12081208
if (!grid) {
1209-
badTypeList.push_back(grid->getName());
1209+
badTypeList.push_back((*it)->getName());
12101210
continue;
12111211
}
12121212

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Extrapolate.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,8 @@ SOP_OpenVDB_Extrapolate::Cache::process(
583583
if (parms.mNeedExt) {
584584
typename ExtGridT::ConstPtr extGrid = openvdb::gridConstPtrCast<ExtGridT>(exPrim->getConstGridPtr());
585585
if (!extGrid) {
586-
std::string msg = "Extension grid (" + extGrid->getName() + ") cannot be converted " +
586+
auto grid = exPrim->getConstGridPtr();
587+
std::string msg = "Extension grid (" + grid->getName() + ") cannot be converted " +
587588
"to the explicit type specified.";
588589
throw std::runtime_error(msg);
589590
}

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Fracture.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ SOP_OpenVDB_Fracture::Cache::process(
531531
residuals.push_back(residual);
532532

533533
} else {
534-
badTypeList.push_back(residual->getName());
534+
badTypeList.push_back((*it)->getName());
535535
continue;
536536
}
537537

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_To_Polygons.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ SOP_OpenVDB_To_Polygons::Cache::referenceMeshing(
896896
typename GridType::ConstPtr grid = openvdb::gridConstPtrCast<GridType>(*it);
897897

898898
if (!grid) {
899-
badTypeList.push_back(grid->getName());
899+
badTypeList.push_back((*it)->getName());
900900
continue;
901901
}
902902

0 commit comments

Comments
 (0)