diff options
| author | Josef Bacik <josef@redhat.com> | 2011-12-02 12:52:15 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-08-09 14:32:30 +0200 |
| commit | 65b01dcc5a6a261227faeaeb7a182a619d1ce4cc (patch) | |
| tree | 55d8ffb2eb8634d2cdac46ce47e2828ff84860a3 /cmds-restore.c | |
| parent | e35450fa53139572afdd759619610cc7f5277626 (diff) | |
btrfs-progs: fix regexec to only work if we actually have a regexec
We were unconditionally executing our regular expression, even though we may not
have one, so check to make sure mreg is not null before calling regexec.
Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'cmds-restore.c')
| -rw-r--r-- | cmds-restore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index 1aae3902..3be6e719 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -649,7 +649,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, /* full path from root of btrfs being restored */ snprintf(fs_name, 4096, "%s/%s", dir, filename); - if (REG_NOMATCH == regexec(mreg, fs_name, 0, NULL, 0)) + if (mreg && REG_NOMATCH == regexec(mreg, fs_name, 0, NULL, 0)) goto next; /* full path from system root */ |