r4504 - in glibc-package/branches/eglibc-2.13/debian: . patches/kfreebsd
Author: aurel32
Date: 2011-02-08 08:42:09 +0000 (Tue, 08 Feb 2011)
New Revision: 4504
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
Log:
- Update patches/kfreebsd/local-readdir_r.diff.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-08 08:28:35 UTC (rev 4503)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-08 08:42:09 UTC (rev 4504)
@@ -85,6 +85,7 @@
- Update patches/any/submitted-bits-fcntl_h-at.diff.
- Remove patches/any/submitted-nis-shadow.diff (obsolete).
- Remove patches/any/submitted-futex_robust_pi.diff (obsolete).
+ - Update patches/kfreebsd/local-readdir_r.diff.
* debian/sysdeps/*.mk, debhelper.in/libc.preinst: bump minimal Linux
kernel version to 2.6.26, and minimal FreeBSD kernel version to
8.0.0. Closes: #610475.
Modified: glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff 2011-02-08 08:28:35 UTC (rev 4503)
+++ glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff 2011-02-08 08:42:09 UTC (rev 4504)
@@ -4,14 +4,15 @@
--- a/sysdeps/unix/readdir_r.c
+++ b/sysdeps/unix/readdir_r.c
-@@ -114,14 +114,32 @@
+@@ -114,15 +114,32 @@
if (dp != NULL)
{
-#ifdef GETDENTS_64BIT_ALIGNED
- /* The d_reclen value might include padding which is not part of
- the DIRENT_TYPE data structure. */
-- reclen = MIN (reclen, sizeof (DIRENT_TYPE));
+- reclen = MIN (reclen,
+- offsetof (DIRENT_TYPE, d_name) + sizeof (dp->d_name));
-#endif
+ /* The required size of *entry, according to POSIX, is
+ offsetof (DIRENT_TYPE, d_name[0]) + NAME_MAX + 1.
Reply to: