Changeset 3333 in MondoRescue for branches

Timestamp:

Jan 26, 2015, 8:20:04 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a mondoarchive crash with option -v (Do not use finish before bkpinfo has been allocated but exit) (Philippe Lefevre)

File:

• branches/3.2/mondo/src/mondoarchive/mondoarchive.c (modified) (2 diffs)

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -165 +165 @@
     FILE *fin = NULL;
 
-    /* Make sure I'm root; abort if not */
-    if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
-        finish(127);
-    }
-
     /* If -V, -v or --version then echo version no. and quit */
     if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
         printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
-        finish(0);
+        if (getuid() != 0) fprintf(stderr, "Please run the mondoarchive command as root.\n");
+        exit(0);
+    }
+
+    /* Make sure I'm root; abort if not */
+    if (getuid() != 0) {
+        fprintf(stderr, "Please run as root.\n");
+        exit(127);
     }
 
@@ -184 +185 @@
     if (!(bkpinfo = (struct s_bkpinfo *)malloc(sizeof(struct s_bkpinfo)))) {
         fprintf(stderr, "Cannot malloc bkpinfo\n");
-        finish(-1);
-    }
+        exit(-1);
+    }
+    /*  Now on we can use finish to exit as bkpingo has been initialized */
     log_msg(9, "reset_bkpinfo");
     reset_bkpinfo();