rpms/tar/F-10 tar-1.19-xattrs.patch,1.6,1.7 tar.spec,1.73,1.74

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/tar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11164

Modified Files:
	tar-1.19-xattrs.patch tar.spec 
Log Message:
fix off-by-one errors in xattrs patch (#472355)

tar-1.19-xattrs.patch:

Index: tar-1.19-xattrs.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/F-10/tar-1.19-xattrs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tar-1.19-xattrs.patch	10 Oct 2008 21:31:20 -0000	1.6
+++ tar-1.19-xattrs.patch	25 Nov 2008 11:08:10 -0000	1.7
@@ -284,7 +284,7 @@
 +  
 +  if (ret != -1)
 +    {
-+      *ret_ptr = xmemdup (val, ret);
++      *ret_ptr = xmemdup (val, ret + 1);
 +      *ret_len = ret;
 +    }
 +  else if (errno != ENOATTR)
@@ -1370,21 +1370,27 @@
    if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
      {
        /* 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->permstatus = permstatus;
    data->after_links = 0;
 +  data->cntx_name = NULL;
 +  assign_string (&data->cntx_name, st->cntx_name);
 +  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
 +    {
 +      data->acls_a_ptr = NULL;
 +      data->acls_a_len = 0;
 +    }
 +  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
 +    {
 +      data->acls_d_ptr = NULL;


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/F-10/tar.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tar.spec	10 Nov 2008 13:09:28 -0000	1.73
+++ tar.spec	25 Nov 2008 11:08:11 -0000	1.74
@@ -2,7 +2,7 @@
 Name: tar
 Epoch: 2
 Version: 1.20
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -93,6 +93,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Nov 21 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.20-5
+- fix off-by-one errors in xattrs patch (#472355)
+
 * Mon Nov 10 2008 Kamil Dudka <kdudka at redhat.com> 2:1.20-4
 - fixed bug #465803: labels with --multi-volume (upstream patch)