Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/common/libmondo-verify.c (modified) (6 diffs)

branches/2.2.10/mondo/src/common/libmondo-verify.c

@@ -623 +623 @@
     /*@ char ************************************************************ */
     char *test_file = NULL;
-    char *biggie_cksum;
-    char *orig_cksum;
+    char *biggie_cksum = NULL;
+    char *orig_cksum = NULL;
     char *tmp = NULL;
     char *slice_fnam;
@@ -634 +634 @@
     long long slice_siz;
 
-    malloc_string(biggie_cksum);
-    malloc_string(orig_cksum);
     malloc_string(slice_fnam);
     assert(bkpinfo != NULL);
@@ -651 +649 @@
          ctrl_chr != BLK_STOP_A_BIGGIE;
          res =
-         read_header_block_from_stream(&slice_siz, slice_fnam,
-                                       &ctrl_chr)) {
+         read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr)) {
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -659 +656 @@
         unlink(test_file);
         res =
-            read_header_block_from_stream(&slice_siz, slice_fnam,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             log_msg(2, "test_file = %s", test_file);
@@ -668 +664 @@
         retval += res;
     }
-    strcpy(biggie_cksum, slice_fnam);
+    mr_asprintf(biggie_cksum, "%s", slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        strcpy(orig_cksum, calc_checksum_of_file(biggie_fname));
+        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
@@ -680 +676 @@
         }
     }
+    mr_free(biggie_cksum);
     mr_free(test_file);
-    paranoid_free(biggie_cksum);
-    paranoid_free(orig_cksum);
+    mr_free(orig_cksum);
     paranoid_free(slice_fnam);
     return (retval);