Update.

	* sysdeps/unix/bsd/ulimit.c (ulimit): Handle overflow in
	UL_SETFSIZE computations better.

diff --git a/ChangeLog b/ChangeLog
index e7de6f0..1e6faaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-24  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/bsd/ulimit.c (ulimit): Handle overflow in
+       UL_SETFSIZE computations better.
+
        * rt/Makefile: Remove use of filter for librt again.
 
        * sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Handle overflow in

diff --git a/sysdeps/unix/bsd/ulimit.c b/sysdeps/unix/bsd/ulimit.c
index ed9695b..91d77e9 100644 (file)
--- a/sysdeps/unix/bsd/ulimit.c
+++ b/sysdeps/unix/bsd/ulimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 96, 97, 98, 2001 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
@@ -60,8 +60,16 @@ ulimit (int cmd, ...)
       {
        long int newlimit = va_arg (va, long int);
 
-       limit.rlim_cur = newlimit * 512;
-       limit.rlim_max = newlimit * 512;
+       if ((rlim_t) newlimit > RLIM_INFINITY / 512)
+         {
+           limit.rlim_cur = RLIM_INFINITY;
+           limit.rlim_max = RLIM_INFINITY;
+         }
+       else
+         {
+           limit.rlim_cur = newlimit * 512;
+           limit.rlim_max = newlimit * 512;
+         }
 
        result = setrlimit (RLIMIT_FSIZE, &limit);
       }