StreamWriter: Opus-provided improvements to improve resilience for errors

2026-05-04 11:44:46 +02:00
parent 0a2c370983
commit f7a9e4eab1
7 changed files with 277 additions and 109 deletions
@@ -727,12 +727,24 @@ void HDF5File::Close() {
    if (id < 0)
        return;

-    if (H5Fflush(id, H5F_SCOPE_GLOBAL) < 0)
-        throw JFJochException(JFJochExceptionCategory::HDF5, "Failed to flush HDF5 file");
-
-    if (H5Fclose(id) < 0)
-        throw JFJochException(JFJochExceptionCategory::HDF5, "Failed to close HDF5 file");
+    // Invalidate first; if anything below fails (e.g. ENOSPC) we must NOT
+    // leave a live id behind for the destructor or later code to touch.
+    const hid_t local_id = id;
    id = -1;
+
+    herr_t flush_err = 0;
+    H5E_BEGIN_TRY {
+        flush_err = H5Fflush(local_id, H5F_SCOPE_GLOBAL);
+    } H5E_END_TRY;
+
+    herr_t close_err = 0;
+    H5E_BEGIN_TRY {
+        close_err = H5Fclose(local_id);
+    } H5E_END_TRY;
+
+    if (flush_err < 0 || close_err < 0)
+        throw JFJochException(JFJochExceptionCategory::HDF5,
+                              "Failed to flush/close HDF5 file (likely no space left on device)");
 }

 HDF5File::~HDF5File() {
@@ -848,9 +860,16 @@ void HDF5DataSet::Close() {
    if (id < 0)
        return;

-    if (H5Dclose(id) < 0)
-        throw JFJochException(JFJochExceptionCategory::HDF5, "Cannot close HDF5 dataset");
+    const hid_t local_id = id;
    id = -1;
+
+    herr_t err = 0;
+    H5E_BEGIN_TRY {
+        err = H5Dclose(local_id);
+    } H5E_END_TRY;
+
+    if (err < 0)
+        throw JFJochException(JFJochExceptionCategory::HDF5, "Cannot close HDF5 dataset");
 }

 HDF5DataSet::~HDF5DataSet() {