Merge pull request #52 from adrianreber/2024-12-30-segfault

rocky · web-flow · commit 2673020e58b7 · 2024-12-30T07:17:40.000-05:00
Fix segfault when running "cd-paranoia -L -- -1"
diff --git a/src/cd-paranoia.c b/src/cd-paranoia.c
@@ -637,11 +637,13 @@ static void cleanup(void) {
   free_and_null(force_cdrom_device);
   free_and_null(span);
   if (logfile_open) {
-    fclose(logfile);
+    if (logfile)
+      fclose(logfile);
     logfile = NULL;
   }
   if (reportfile_open) {
-    fclose(reportfile);
+    if (reportfile)
+      fclose(reportfile);
     reportfile = NULL;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -637,11 +637,13 @@ static void cleanup(void) {`
`637`	`637`	`free_and_null(force_cdrom_device);`
`638`	`638`	`free_and_null(span);`
`639`	`639`	`if (logfile_open) {`
`640`		`- fclose(logfile);`
	`640`	`+ if (logfile)`
	`641`	`+ fclose(logfile);`
`641`	`642`	`logfile = NULL;`
`642`	`643`	`}`
`643`	`644`	`if (reportfile_open) {`
`644`		`- fclose(reportfile);`
	`645`	`+ if (reportfile)`
	`646`	`+ fclose(reportfile);`
`645`	`647`	`reportfile = NULL;`
`646`	`648`	`}`
`647`	`649`	`}`