aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/condvar.c8
-rw-r--r--nis/nss_nisplus/nisplus-parser.c9
4 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f214f1519c..ed4978510d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-09-24 Ulrich Drepper <drepper@cygnus.com>
+
+ * nis/nss_nisplus/nisplus-parser.c (_nss_nisplus_parse_grent): Do
+ not ovverwrite last group member with NULL pointer.
+ Reported by Thomas Winder <thomas.winder@newlogic.at>.
+
1999-09-24 Andreas Jaeger <aj@suse.de>
* stdio-common/tst-printf.c (main): Add a testcase for large
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1551059a4a..1881795b91 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-25 Ulrich Drepper <drepper@cygnus.com>
+
+ * condvar.c (pthread_cond_timedwait_relative): Never return with
+ EINTR. Patch by Andreas Schwab.
+
1999-09-19 Ulrich Drepper <drepper@cygnus.com>
* signals.c (sigaction): Correct last patch. Don't select
diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
index cd22a241af..a27b093e05 100644
--- a/linuxthreads/condvar.c
+++ b/linuxthreads/condvar.c
@@ -76,6 +76,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
enqueue(&cond->__c_waiting, self);
__pthread_unlock(&cond->__c_lock);
pthread_mutex_unlock(mutex);
+ continue_waiting:
/* Set up a longjmp handler for the restart and cancel signals */
if (sigsetjmp(jmpbuf, 1) == 0) {
THREAD_SETMEM(self, p_signal_jmp, &jmpbuf);
@@ -113,13 +114,16 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_mutex_lock(mutex);
pthread_exit(PTHREAD_CANCELED);
}
- /* If not signaled: also remove ourselves and return an error code */
+ /* If not signaled: also remove ourselves and return an error code, but
+ only if the timeout has elapsed. If not, jsut continue waiting. */
if (THREAD_GETMEM(self, p_signal) == 0) {
+ if (retsleep != 0)
+ goto continue_waiting;
__pthread_lock(&cond->__c_lock, self);
remove_from_queue(&cond->__c_waiting, self);
__pthread_unlock(&cond->__c_lock);
pthread_mutex_lock(mutex);
- return retsleep == 0 ? ETIMEDOUT : EINTR;
+ return ETIMEDOUT;
}
/* Otherwise, return normally */
pthread_mutex_lock(mutex);
diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c
index 35b8a2881e..e8d107922b 100644
--- a/nis/nss_nisplus/nisplus-parser.c
+++ b/nis/nss_nisplus/nisplus-parser.c
@@ -231,9 +231,9 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr,
break;
if (room_left < sizeof (char *))
- goto no_more_room;
+ goto no_more_room;
room_left -= sizeof (char *);
- gr->gr_mem[count] = line;
+ gr->gr_mem[count++] = line;
while (*line != '\0' && *line != ',' && !isspace (*line))
++line;
@@ -248,13 +248,10 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr,
++line;
else
++line;
- ++count;
}
- else
- gr->gr_mem[count+1] = NULL;
}
if (room_left < sizeof (char *))
- goto no_more_room;
+ goto no_more_room;
room_left -= sizeof (char *);
gr->gr_mem[count] = NULL;