btrfs-progs: fix unaligned access calculating raid56 data

[platform/upstream/btrfs-progs.git] / btrfs-image.c

diff --git a/btrfs-image.c b/btrfs-image.c
index 660b0aa..af5437b 100644 (file)
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -195,7 +195,7 @@ static char *generate_garbage(u32 name_len)
                return NULL;
 
        for (i = 0; i < name_len; i++) {
-               char c = rand() % 94 + 33;
+               char c = rand_range(94) + 33;
 
                if (c == '/')
                        c++;
@@ -408,7 +408,7 @@ static char *find_collision(struct metadump_struct *md, char *name,
                        "generating normal garbage, it won't match indexes\n",
                        val->len, val->val);
                for (i = 0; i < name_len; i++) {
-                       char c = rand() % 94 + 33;
+                       char c = rand_range(94) + 33;
 
                        if (c == '/')
                                c++;
@@ -2598,6 +2598,7 @@ static int restore_metadump(const char *input, FILE *out, int old_restore,
                if (stat(target, &st)) {
                        fprintf(stderr, "statting %s failed\n", target);
                        close_ctree(info->chunk_root);
+                       free(cluster);
                        return 1;
                }