Changeset 1390 in MondoRescue

Timestamp:

May 3, 2007, 2:03:17 AM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to solve mr_cleanup multiple call while struct mr_cnf not initialized

Location:

branches/stable/mondo/src

Files:

• lib/mr_err.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (3 diffs)

branches/stable/mondo/src/lib/mr_err.c

@@ -17 +17 @@
 #include <stdlib.h>
 
-#include "mr_msg.h"
-
 /* Pointer to the right cleanup function provided by each main */
 extern void (*mr_cleanup)(void);

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -195 +195 @@
 void (*mr_cleanup)(void) = NULL;
 
+/* Just for init */
+void mr_ar_cleanup_empty(void) {
+}
+
 /* Cleanup all memory allocated in various structures */
 void mr_ar_cleanup(void) {
@@ -232 +236 @@
     printf(_("Initializing..."));
 
-    /* Reference the right cleanup function for mr_exit */
-    mr_cleanup = &mr_ar_cleanup;
+    /* Reference a dummy cleanup function for mr_exit temporarily */
+    mr_cleanup = &mr_ar_cleanup_empty;
 
     /* initialize log file with time stamp */
@@ -262 +266 @@
     }
     mr_ar_store_conf(&mr_conf);
+    /* Reference the right cleanup function for mr_exit now it's allocated */
+    mr_cleanup = &mr_ar_cleanup;
+
     mr_conf_close();