Don't crash when checking for broken files

qarmin · May 7, 2022 · fe08aa1 · fe08aa1
1 parent dd203b6
commit fe08aa1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   quality:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 

diff --git a/czkawka_core/src/broken_files.rs b/czkawka_core/src/broken_files.rs
@@ -468,12 +468,27 @@ impl BrokenFiles {
                         Err(_inspected) => Some(None), // TODO maybe throw error or something
                     },
                     TypeOfFile::Audio => match fs::File::open(&file_entry.path) {
-                        Ok(file) => match audio_checker::parse_audio_file(file) {
-                            Ok(_) => Some(None),
-                            Err(e) => {
-                                file_entry.error_string = e.to_string();
-                                Some(Some(file_entry))
-                            }
+                        Ok(file) =>
+                            {
+                                let file_entry_clone = file_entry.clone();
+
+                                let result = panic::catch_unwind(|| {
+                                    match audio_checker::parse_audio_file(file) {
+                                        Ok(_) => Some(None),
+                                        Err(e) => {
+                                            file_entry.error_string = e.to_string();
+                                            Some(Some(file_entry))
+                                        }
+                                    }
+                                });
+
+                                if let Ok(audio_result) = result {
+                                    audio_result
+                                } else {
+                                    println!("External parsing audio library crashed when opening \"{:?}\" audio file, please report bug here - https://github.com/qarmin/audio_checker/issues", file_entry_clone.path);
+                                    Some(Some(file_entry_clone))
+                                }
+
                         },
                         Err(_inspected) => Some(None), // TODO maybe throw error or something
                     },