CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-18 21:32:12 +02:00
Code Issues Projects Releases Wiki Activity

cp --parents: don't use uninitialized memory when restoring permissions

Browse Source 
* src/cp.c (make_dir_parents_private): Always stat each source
directory, in case its permissions are required in re_protect,
when setting permissions of a just-created destination directory.
This commit is contained in:
Jan Blunck
2008-01-07 12:13:42 +01:00
committed by Jim Meyering
parent db58094e11
commit a54e8bb8a5
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-01-07 Jan Blunck <jblunck@suse.de>
cp --parents: don't use uninitialized memory when restoring permissions
* src/cp.c (make_dir_parents_private): Always stat each source
directory, in case its permissions are required in re_protect,
when setting permissions of a just-created destination directory.
2008-01-07 Jim Meyering <meyering@redhat.com>
cp: add a test for today's bug fix.

24
src/cp.c
View File

@@ -403,6 +403,7 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
slash++;
while ((slash = strchr (slash, '/')))
{
int src_errno;
/* Add this directory to the list of directories whose modes need
fixing later. */
struct dir_attr *new = xmalloc (sizeof *new);
@@ -412,12 +413,22 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
*attr_list = new;
*slash = '\0';
src_errno = (stat (src, &new->st) != 0
? errno
: S_ISDIR (new->st.st_mode)
? 0
: ENOTDIR);
if (src_errno)
{
error (0, src_errno, _("failed to get attributes of %s"),
quote (src));
return false;
}
if (stat (dir, &stats) != 0)
{
mode_t src_mode;
mode_t omitted_permissions;
mode_t mkdir_mode;
int src_errno;
/* This component does not exist. We must set
*new_dst and new->st.st_mode inside this loop because,
@@ -425,17 +436,6 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
make_dir_parents_private creates only e_dir/../a if
./b already exists. */
*new_dst = true;
src_errno = (stat (src, &new->st) != 0
? errno
: S_ISDIR (new->st.st_mode)
? 0
: ENOTDIR);
if (src_errno)
{
error (0, src_errno, _("failed to get attributes of %s"),
quote (src));
return false;
}
src_mode = new->st.st_mode;
/* If the ownership or special mode bits might change,