Author: sthibault
Date: 2010-02-27 22:50:13 +0000 (Sat, 27 Feb 2010)
New Revision: 4208
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
Log:
patches/hurd-i386/cvs-setsid.diff: Update to git version.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-02-27 00:03:17 UTC (rev
4207)
+++ glibc-package/trunk/debian/changelog 2010-02-27 22:50:13 UTC (rev
4208)
@@ -5,6 +5,7 @@
* Update debian/testsuite-checking/expected-results-i486-gnu-libc.
* patches/any/submitted-remove.diff: New patch to fix remove() on
directory on non-Linux ports.
+ * patches/hurd-i386/cvs-setsid.diff: Update to git version.
[ Aurelien Jarno ]
* debian/control.in/*: add ${misc:Depends} to all binary packages.
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
2010-02-27 00:03:17 UTC (rev 4207)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff
2010-02-27 22:50:13 UTC (rev 4208)
@@ -1,12 +1,40 @@
-Fix bogus port deallocation due to uninitialized variable
+commit e87e2f48effefe5e70a9a21bc13d7187608d0365
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date: Tue Dec 22 11:51:44 2009 -0800
+ Hurd: Fix possibly uninitialized variable in _hurd_locked_install_cttyid.
+
---
- hurdioctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ChangeLog | 5 +++++
+ hurd/hurdioctl.c | 24 ++++++++++--------------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
---- eglibc-2.10.2-orig/hurd/hurdioctl.c 2006-08-17 02:18:26.000000000
+0100
-+++ eglibc-2.10.2/hurd/hurdioctl.c 2009-12-22 03:13:05.000000000 +0000
-@@ -169,7 +169,7 @@
+diff --git a/ChangeLog b/ChangeLog
+index 3ff2684..aba0d71 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2009-12-22 Samuel Thibault <samuel.thiba...@ens-lyon.org>
++
++ * hurd/hurdioctl.c (_hurd_locked_install_cttyid): Set newctty to
++ MACH_PORT_NULL when id != cttyid.
++
+ 2009-12-20 Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+ * sysdeps/mach/hurd/getcwd.c (cleanup): Do not call
+diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c
+index 96d910b..7c68984 100644
+--- a/hurd/hurdioctl.c
++++ b/hurd/hurdioctl.c
+@@ -1,5 +1,6 @@
+ /* ioctl commands which must be done in the C library.
+- Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
++ Copyright (C) 1994,95,96,97,99,2001,2002,2009
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -169,33 +170,28 @@ _hurd_locked_install_cttyid (mach_port_t cttyid)
for (i = 0; i < _hurd_dtablesize; ++i)
{
struct hurd_fd *const d = _hurd_dtable[i];
@@ -15,3 +43,36 @@
if (d == NULL)
/* Nothing to do for an unused descriptor cell. */
+ continue;
+
+- if (cttyid == MACH_PORT_NULL)
+- /* We now have no controlling tty at all. */
+- newctty = MACH_PORT_NULL;
+- else
++ if (cttyid != MACH_PORT_NULL)
++ /* We do have some controlling tty. */
+ HURD_PORT_USE (&d->port,
+ ({ mach_port_t id;
+ /* Get the io object's cttyid port. */
+ if (! __term_getctty (port, &id))
+ {
+- if (id == cttyid && /* Is it ours? */
++ if (id == cttyid /* Is it ours? */
+ /* Get the ctty io port. */
+- __term_open_ctty (port,
+- _hurd_pid, _hurd_pgrp,
+- &newctty))
++ && __term_open_ctty (port,
++ _hurd_pid, _hurd_pgrp,
++ &newctty))
+ /* XXX it is our ctty but the call failed? */
+ newctty = MACH_PORT_NULL;
+- __mach_port_deallocate
+- (__mach_task_self (), (mach_port_t) id);
++ __mach_port_deallocate (__mach_task_self (), id);
+ }
+- else
+- newctty = MACH_PORT_NULL;
+ 0;
+ }));
+
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nlvue-0006rh...@alioth.debian.org
