Skip to content

Issue 69303 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selimnairb merged 6 commits into from
Feb 28, 2025
Merged

Issue 69303 #125

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0508309
Fixed segmentation faults by giving H5DOpen and H5GOpen error checking
anthonypapetti Oct 18, 2024
816c4d2
Merge branch 'master' into issue-69303
anthonypapetti Nov 14, 2024
d9535fe
Fixed syntax in bag_dataset
anthonypapetti Nov 14, 2024
a48c7a3
Fixed open protector method
anthonypapetti Feb 21, 2025
77bba21
Printed unused exception messages
anthonypapetti Feb 24, 2025
cf05040
Changed stderr to cerr
anthonypapetti Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions api/bag_dataset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,29 @@ std::tuple<double, double> Dataset::gridToGeo(
return {x, y};
}


hid_t DopenProtector2(hid_t loc_id, const char *name, hid_t dapl_id) {
hid_t id = -1;
try {
id = H5Dopen2(loc_id, name, dapl_id);
} catch (std::exception& e) {
std::cerr << e.what();
id = -1;
}
return id;
}

hid_t GopenProtector2(hid_t loc_id, const char *name, hid_t dapl_id) {
hid_t id = -1;
try {
id = H5Gopen2(loc_id, name, dapl_id);
} catch (std::exception& e) {
std::cerr << e.what();
id = -1;
}
return id;
}

void handleAbrt(int signum) {
std::cerr << "\nUnrecoverable HDF5 Error \n";
exit(signum);
Expand Down Expand Up @@ -1095,8 +1118,7 @@ void Dataset::readDataset(
const std::string internalPath = Layer::getInternalPath(layerType);
if (internalPath.empty())
continue;

const hid_t id = H5Dopen2(bagGroup.getLocId(), internalPath.c_str(),
hid_t id = DopenProtector2(bagGroup.getLocId(), internalPath.c_str(),
H5P_DEFAULT);
if (id < 0)
continue;
Expand All @@ -1112,7 +1134,7 @@ void Dataset::readDataset(
// If the BAG is version 1.5+ ...
if (bagVersion >= 1'005'000)
{
hid_t id = H5Dopen2(bagGroup.getLocId(), NODE_GROUP_PATH, H5P_DEFAULT);
hid_t id = DopenProtector2(bagGroup.getLocId(), NODE_GROUP_PATH, H5P_DEFAULT);
if (id >= 0)
{
H5Dclose(id);
Expand All @@ -1127,8 +1149,7 @@ void Dataset::readDataset(
NODE);
this->addLayer(InterleavedLegacyLayer::open(*this, *layerDesc));
}

id = H5Dopen2(bagGroup.getLocId(), ELEVATION_SOLUTION_GROUP_PATH,
id = DopenProtector2(bagGroup.getLocId(), ELEVATION_SOLUTION_GROUP_PATH,
H5P_DEFAULT);
if (id >= 0)
{
Expand All @@ -1153,7 +1174,7 @@ void Dataset::readDataset(
}

// Read optional VR
hid_t id = H5Dopen2(bagGroup.getLocId(), VR_TRACKING_LIST_PATH, H5P_DEFAULT);
hid_t id = DopenProtector2(bagGroup.getLocId(), VR_TRACKING_LIST_PATH, H5P_DEFAULT);
if (id >= 0)
{
H5Dclose(id);
Expand All @@ -1171,7 +1192,7 @@ void Dataset::readDataset(
}

// optional VRNodeLayer
id = H5Dopen2(bagGroup.getLocId(), VR_NODE_PATH, H5P_DEFAULT);
id = DopenProtector2(bagGroup.getLocId(), VR_NODE_PATH, H5P_DEFAULT);
if (id >= 0)
{
H5Dclose(id);
Expand All @@ -1184,7 +1205,7 @@ void Dataset::readDataset(
m_pTrackingList = std::unique_ptr<TrackingList>(new TrackingList{*this});

// Read optional Surface Corrections
id = H5Dopen2(bagGroup.getLocId(), VERT_DATUM_CORR_PATH, H5P_DEFAULT);
id = DopenProtector2(bagGroup.getLocId(), VERT_DATUM_CORR_PATH, H5P_DEFAULT);
if (id >= 0)
{
H5Dclose(id);
Expand All @@ -1197,7 +1218,7 @@ void Dataset::readDataset(
if (bagVersion >= 2'000'000)
{
// Add all existing GeorefMetadataLayers
id = H5Gopen2(bagGroup.getLocId(), GEOREF_METADATA_PATH, H5P_DEFAULT);
id = GopenProtector2(bagGroup.getLocId(), GEOREF_METADATA_PATH, H5P_DEFAULT);
if (id >= 0)
{
H5Gclose(id);
Expand Down
Loading