rpms/tar
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix off-by-one errors in xattrs patch (#472355)

Browse Source
This commit is contained in:
Ondrej Vasik 2008-11-21 17:44:38 +00:00
parent c17223a370
commit 3a1441e2a7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tar-1.19-xattrs.patch
View File

@ -284,7 +284,7 @@ diff -up /dev/null tar-1.17/src/xattrs.c
+ +
+ if (ret != -1) + if (ret != -1)
+ { + {
+ *ret_ptr = xmemdup (val, ret); + *ret_ptr = xmemdup (val, ret + 1);
+ *ret_len = ret; + *ret_len = ret;
+ } + }
+ else if (errno != ENOATTR) + else if (errno != ENOATTR)
@ -1370,21 +1370,27 @@ diff -up tar-1.17/src/tar.h.xattrs tar-1.17/src/tar.h
if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS) if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
{ {
/* When lchown exists, it should be used to change the attributes of /* When lchown exists, it should be used to change the attributes of
@@ -352,6 +375,23 @@ delay_set_stat (char const *file_name, s @@ -352,6 +375,29 @@ delay_set_stat (char const *file_name, s
data->invert_permissions = invert_permissions; data->invert_permissions = invert_permissions;
data->permstatus = permstatus; data->permstatus = permstatus;
data->after_links = 0; data->after_links = 0;
+ data->cntx_name = NULL; + data->cntx_name = NULL;
+ assign_string (&data->cntx_name, st->cntx_name); + assign_string (&data->cntx_name, st->cntx_name);
+ if (st->acls_a_ptr) + if (st->acls_a_ptr)
+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len); + {
+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1);
+ data->acls_a_len = st->acls_a_len;
+ }
+ else + else
+ { + {
+ data->acls_a_ptr = NULL; + data->acls_a_ptr = NULL;
+ data->acls_a_len = 0; + data->acls_a_len = 0;
+ } + }
+ if (st->acls_d_ptr) + if (st->acls_d_ptr)
+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len); + {
+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1);
+ data->acls_d_len = st->acls_d_len;
+ }
+ else + else
+ { + {
+ data->acls_d_ptr = NULL; + data->acls_d_ptr = NULL;

5
tar.spec
View File

@ -2,7 +2,7 @@ Summary: A GNU file archiving program
Name: tar Name: tar
Epoch: 2 Epoch: 2
Version: 1.20 Version: 1.20
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/ URL: http://www.gnu.org/software/tar/
@ -93,6 +93,9 @@ fi
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Fri Nov 21 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-5
- fix off-by-one errors in xattrs patch (#472355)
* Mon Nov 10 2008 Kamil Dudka <kdudka@redhat.com> 2:1.20-4 * Mon Nov 10 2008 Kamil Dudka <kdudka@redhat.com> 2:1.20-4
- fixed bug #465803: labels with --multi-volume (upstream patch) - fixed bug #465803: labels with --multi-volume (upstream patch)