RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: free memory and close file descriptor in btrfs receive 

Nothing really important since this is not part of the library and
at the end exit() is called.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
This commit is contained in:
Stefan Behrens 2013-04-09 19:08:35 +02:00 committed by David Sterba
parent 969d0cbb51
commit 04629af38a
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmds-receive.c
View File

@ -151,6 +151,7 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
r->parent_subvol = NULL; r->parent_subvol = NULL;
r->cur_subvol->path = strdup(path); r->cur_subvol->path = strdup(path);
free(r->full_subvol_path);
r->full_subvol_path = path_cat(r->root_path, path); r->full_subvol_path = path_cat(r->root_path, path);
fprintf(stderr, "At subvol %s\n", path); fprintf(stderr, "At subvol %s\n", path);
@ -196,6 +197,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
r->parent_subvol = NULL; r->parent_subvol = NULL;
r->cur_subvol->path = strdup(path); r->cur_subvol->path = strdup(path);
free(r->full_subvol_path);
r->full_subvol_path = path_cat(r->root_path, path); r->full_subvol_path = path_cat(r->root_path, path);
fprintf(stderr, "At snapshot %s\n", path); fprintf(stderr, "At snapshot %s\n", path);
@ -803,9 +805,7 @@ int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
ret = subvol_uuid_search_init(r->mnt_fd, &r->sus); ret = subvol_uuid_search_init(r->mnt_fd, &r->sus);
if (ret < 0) if (ret < 0)
return ret; goto out;
r->write_fd = -1;
while (!end) { while (!end) {
ret = btrfs_read_and_process_send_stream(r_fd, &send_ops, r); ret = btrfs_read_and_process_send_stream(r_fd, &send_ops, r);
@ -824,7 +824,26 @@ int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
ret = 0; ret = 0;
out: out:
if (r->write_fd != -1) {
close(r->write_fd);
r->write_fd = -1;
}
free(r->root_path);
r->root_path = NULL;
free(r->write_path);
r->write_path = NULL;
free(r->full_subvol_path);
r->full_subvol_path = NULL;
if (r->cur_subvol) {
free(r->cur_subvol->path);
free(r->cur_subvol);
r->cur_subvol = NULL;
}
subvol_uuid_search_finit(&r->sus); subvol_uuid_search_finit(&r->sus);
if (r->mnt_fd != -1) {
close(r->mnt_fd);
r->mnt_fd = -1;
}
return ret; return ret;
} }
@ -839,6 +858,8 @@ static int do_cmd_receive(int argc, char **argv)
int ret; int ret;
memset(&r, 0, sizeof(r)); memset(&r, 0, sizeof(r));
r.mnt_fd = -1;
r.write_fd = -1;
while ((c = getopt(argc, argv, "vf:")) != -1) { while ((c = getopt(argc, argv, "vf:")) != -1) {
switch (c) { switch (c) {