Update.

2001-04-11  Ulrich Drepper  <drepper@redhat.com>

	* cancel.c (_pthread_cleanup_push): Catch invalid __prev buffer
	and remove it.
	(_pthread_cleanup_push_defer): Likewise.

	* tst-cancel.c (main): Fix loop printing cleanup output.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 805e837af5aaff2a6a46b173de670807bfffb7fd..47c15c65cba1839f446b48eb9a1bd9feeeb8c541 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-11  Ulrich Drepper  <drepper@redhat.com>
+
+       * cancel.c (_pthread_cleanup_push): Catch invalid __prev buffer
+       and remove it.
+       (_pthread_cleanup_push_defer): Likewise.
+
+       * tst-cancel.c (main): Fix loop printing cleanup output.
+
 2001-04-10  kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
        * sysdeps/sh/pspinlock.c (__pthread_spin_lock): Fix a reverse

diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c
index ed67a6845fea1ee83da320b7b2083461c333403d..32ad17c838f0a0166ef020ed50bc39f9adc4dce3 100644 (file)
--- a/linuxthreads/cancel.c
+++ b/linuxthreads/cancel.c
@@ -125,6 +125,18 @@ void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer,
   buffer->__routine = routine;
   buffer->__arg = arg;
   buffer->__prev = THREAD_GETMEM(self, p_cleanup);
+  if (buffer->__prev != NULL)
+    {
+#if _STACK_GROWS_DOWN
+      if ((char *) buffer >= (char *) buffer->__prev)
+       buffer->__prev = NULL;
+#elif _STACK_GROWS_UP
+      if ((char *) buffer <= (char *) buffer->__prev)
+       buffer->__prev = NULL;
+#else
+# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
+#endif
+    }
   THREAD_SETMEM(self, p_cleanup, buffer);
 }
 
@@ -144,6 +156,16 @@ void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer,
   buffer->__arg = arg;
   buffer->__canceltype = THREAD_GETMEM(self, p_canceltype);
   buffer->__prev = THREAD_GETMEM(self, p_cleanup);
+  if (buffer->__prev != NULL)
+    {
+#if _STACK_GROWS_DOWN
+      if ((char *) buffer >= (char *) buffer->__prev)
+       buffer->__prev = NULL;
+#elif _STACK_GROWS_UP
+      if ((char *) buffer <= (char *) buffer->__prev)
+       buffer->__prev = NULL;
+#endif
+    }
   THREAD_SETMEM(self, p_canceltype, PTHREAD_CANCEL_DEFERRED);
   THREAD_SETMEM(self, p_cleanup, buffer);
 }
@@ -174,8 +196,6 @@ void __pthread_perform_cleanup(char *currentframe)
 #elif _STACK_GROWS_UP
       if ((char *) c >= currentframe)
        break;
-#else
-# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
 #endif
       c->__routine(c->__arg);
     }

diff --git a/linuxthreads/tst-cancel.c b/linuxthreads/tst-cancel.c
index da70d1278ff134cd438da542093fe5980c965757..75d6c0de665d70ef65e6d0e64bcb5754998d2a07 100644 (file)
--- a/linuxthreads/tst-cancel.c
+++ b/linuxthreads/tst-cancel.c
@@ -142,7 +142,7 @@ main (void)
       while (1)
        {
          ssize_t n = read (fd, buf, sizeof buf);
-         if (n < 0)
+         if (n <= 0)
            break;
          write (STDOUT_FILENO, buf, n);
        }