From da85de8a42a3f0c28a8cd48c34d93801afb7aa23 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 11 Oct 2013 22:26:07 -0400 Subject: [PATCH] btrfs: Fix improper memmove usage in do_btrfs_subvolume_list (RHBZ#1018149). The third parameter (number of bytes to copy) was given as an offset relative to dest, when it should be relative to src. This fixes some valgrind warnings I happened across. --- daemon/btrfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index c3247ac04..765dec61a 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -473,7 +473,7 @@ do_btrfs_subvolume_list (const mountable_t *fs) #undef XSTRTOU64 - memmove (line, line + ovector[6], ovector[7] + 1); + memmove (line, line + ovector[6], ovector[7] - ovector[6] + 1); this->btrfssubvolume_path = line; }