source: patches/glibc-2.5-branch_update-1.patch@ f1758c8

ChangeLog

@@ +1 @@
+2006-10-06  Andreas Jaeger  <aj@suse.de>
+
+        * include/features.h (__GLIBC_MINOR__): It's glibc 2.5 now.
+
+2006-10-06  Ulrich Drepper  <drepper@redhat.com>
+
+        * po/pl.po: Update from translation team.
+
+        * nscd/nscd.c (main): Fix typo in message.
+        Patch by Jakub Bogsz <qboosh@pld-linux.org>.
+
+2006-10-02  Jakub Jelinek  <jakub@redhat.com>
+
+        [BZ #3291]
+        * sysdeps/unix/sysv/linux/sparc/sparc64/pause.c: Include
+        errno.h, signal.h, unistd.h and sysdep-cancel.h.
+        (__sigprocmask): Define.
+
+2006-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+        * elf/rtld.c (dl_main): Don't use prelinking if LD_DYNAMIC_WEAK is
+        used.
+
+2006-10-02  Jakub Jelinek  <jakub@redhat.com>
+
+        * nscd/mem.c (mempool_alloc): Round array size to 16 bytes
+        in oldtotal and newtotal calculation.
+        * nscd/nscd-client.h (struct mapped_database): Add datasize
+        field.
+        * nscd/nscd_helper.c (get_mapping): Initialize datasize field.
+        (__nscd_get_map_ref): Get a new mapping even if mapping's data_size
+        increased.
+        (__nscd_cache_search): Add checks to make sure we never reference
+        data beyond the current mapping.
+
+2006-10-02  Dmitry V. Levin  <ldv@altlinux.org>
+
+        * sysdeps/posix/getaddrinfo.c (match_prefix): Make mask and val
+        variables const to avoid compiler warnings.
+
+        * io/fts.c (fts_close): Remove redundant checks.
+        (fts_build): Likewise.
+        (fts_palloc): Likewise.
+
+        * manual/message.texi (Advanced gettext functions,
+        Using gettextized software): Fix typos.
+
+2006-09-30  Ulrich Drepper  <drepper@redhat.com>
+
+        * posix/glob.c (glob_in_dir): Add some comments and asserts to
+        explain why there are no leaks.
+
 2006-09-29  Ulrich Drepper  <drepper@redhat.com>
 
+        * libio/wmemstream.c: Include <wchar.h>.
+        * libio/bug-wmemstream1.c: Likewise.
+        * libio/tst-wmemstream1.c: Likewise.
+        * libio/tst-wmemstream2.c: Likewise.
+
         * version.h (RELEASE): Bump to 2.5.
         * README: Regenerated.
 

elf/rtld.c

@@ -2087 +2087 @@
     }
 
   if (main_map->l_info[ADDRIDX (DT_GNU_LIBLIST)]
-      && ! __builtin_expect (GLRO(dl_profile) != NULL, 0))
+      && ! __builtin_expect (GLRO(dl_profile) != NULL, 0)
+      && ! __builtin_expect (GLRO(dl_dynamic_weak), 0))
     {
       ElfW(Lib) *liblist, *liblistend;
       struct link_map **r_list, **r_listend, *l;

include/features.h

@@ -304 +304 @@
 /* Major and minor version number of the GNU C library package.  Use
    these macros to test for features in specific releases.  */
 #define __GLIBC__       2
-#define __GLIBC_MINOR__ 4
+#define __GLIBC_MINOR__ 5
 
 #define __GLIBC_PREREQ(maj, min) \
         ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))

io/fts.c

@@ -251 +251 @@
         /* Free up child linked list, sort array, path buffer. */
         if (sp->fts_child)
                 fts_lfree(sp->fts_child);
-        if (sp->fts_array)
-                free(sp->fts_array);
+        free(sp->fts_array);
         free(sp->fts_path);
 
         /* Return to original directory, save errno if necessary. */
@@ -705 +704 @@
                                  * structures already allocated.
                                  */
 mem1:                           saved_errno = errno;
-                                if (p)
-                                        free(p);
+                                free(p);
                                 fts_lfree(head);
                                 (void)__closedir(dirp);
                                 cur->fts_info = FTS_ERR;
@@ -1043 +1041 @@
          * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
          */
         if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
-                if (sp->fts_path) {
-                        free(sp->fts_path);
-                        sp->fts_path = NULL;
-                }
+                free(sp->fts_path);
                 sp->fts_path = NULL;
                 __set_errno (ENAMETOOLONG);
                 return (1);

libio/bug-wmemstream1.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <string.h>
+#include <wchar.h>
 
 
 static int

libio/tst-wmemstream1.c

@@ +1 @@
+#include <wchar.h>
+
 #define CHAR_T wchar_t
 #define W(o) L##o
 #define OPEN_MEMSTREAM open_wmemstream

libio/tst-wmemstream2.c

@@ +1 @@
+#include <wchar.h>
+
 #define CHAR_T wchar_t
 #define W(o) L##o
 #define OPEN_MEMSTREAM open_wmemstream

libio/wmemstream.c

@@ -20 +20 @@
 #include "strfile.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <wchar.h>
 
 
 struct _IO_FILE_wmemstream

localedata/ChangeLog

@@ +1 @@
+2006-10-05  Dmitry V. Levin  <ldv@altlinux.org>
+
+        * locales/tt_RU: Fix territory, title and descriptive comment.
+
+2006-10-05  Ulrich Drepper  <drepper@redhat.com>
+
+        * locales/pa_IN (abday): Fix spelling of Sunday.
+        Patch by Mayank Jain <majain@redhat.com>.
+
+2006-10-01  Ulrich Drepper  <drepper@redhat.com>
+
+        * locales/en_GB: Use more complete en_US data in LC_NAME.
+
 2006-09-29  Ulrich Drepper  <drepper@redhat.com>
 
         [BZ #39]

localedata/locales/en_GB

@@ -146 +146 @@
 END LC_MEASUREMENT
 
 LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "en_US"
 END LC_NAME
 
 LC_ADDRESS

localedata/locales/pa_IN

@@ -80 +80 @@
             "<U0A2C><U0A41><U0A71><U0A27><U0020>";/
             "<U0A35><U0A40><U0A30><U0020>";/
             "<U0A36><U0A41><U0A71><U0A15><U0A30><U0020>";/
-            "<U0A36><U0A28><U0A40><U0A1A><U0A30><U0020>"
+            "<U0A36><U0A28><U0A3F><U0A71><U0A1A><U0A30><U0020>"
 %
 % Full weekday names (%A)
 day       "<U0A10><U0A24><U0A35><U0A3E><U0A30><U0020>";/

localedata/locales/tt_RU

@@ -1 +1 @@
 comment_char %
 escape_char  /
 %
-% Tatar Language Locale for Tatarstan
+% Tatar Language Locale for Russia
 % Source:
 % Contact: Pablo Saratxaga, Rinat Norkin
 % Email: <pablo@mandrakesoft.com>, <rinat@taif.ru>
@@ -24 +24 @@
 % replace cyrillic alphabet
 
 LC_IDENTIFICATION
-title "Tatar language locale for Tatarstan"
+title "Tatar language locale for Russia"
 source "Rinat Norkin"
 address ""
 contact "Pablo Saratxaga, Rinat Norkin"
@@ -32 +32 @@
 tel ""
 fax ""
 language "Tatar"
-territory "Tatarstan"
+territory "Russia"
 revision "0.4"
 date "2001-01-28"
 

manual/message.texi

@@ -1189 +1189 @@
 with every language this is the only viable solution except for
 hardcoding the information in the code (which still would require the
 possibility of extensions to not prevent the use of new languages).  The
-details are explained in the GNU @code{gettext} manual.  Here only a a
+details are explained in the GNU @code{gettext} manual.  Here only a
 bit of information is provided.
 
 The information about the plural form selection has to be stored in the
@@ -1590 +1590 @@
 them.
 
 The POSIX locale model uses the environment variables @code{LC_COLLATE},
-@code{LC_CTYPE}, @code{LC_MESSAGES}, @code{LC_MONETARY}, @code{NUMERIC},
+@code{LC_CTYPE}, @code{LC_MESSAGES}, @code{LC_MONETARY}, @code{LC_NUMERIC},
 and @code{LC_TIME} to select the locale which is to be used.  This way
 the user can influence lots of functions.  As we mentioned above the
 @code{gettext} functions also take advantage of this.

manual/stdio.texi

@@ -2393 +2393 @@
 allocates a string (as with @code{malloc}; @pxref{Unconstrained
 Allocation}) to hold the output, instead of putting the output in a
 buffer you allocate in advance.  The @var{ptr} argument should be the
-address of a @code{char *} object, and @code{asprintf} stores a pointer
-to the newly allocated string at that location.
+address of a @code{char *} object, and a successful call to
+@code{asprintf} stores a pointer to the newly allocated string at that
+location.
 
 The return value is the number of characters allocated for the buffer, or
 less than zero if an error occurred. Usually this means that the buffer

nscd/mem.c

@@ -1 +1 @@
 /* Cache memory handling.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
@@ -480 +480 @@
         {
           /* Try to resize the database.  Grow size of 1/8th.  */
           size_t oldtotal = (sizeof (struct database_pers_head)
-                             + db->head->module * sizeof (ref_t)
+                             + roundup (db->head->module * sizeof (ref_t), ALIGN)
                              + db->head->data_size);
           size_t new_data_size = (db->head->data_size
                                   + MAX (2 * len, db->head->data_size / 8));
           size_t newtotal = (sizeof (struct database_pers_head)
-                             + db->head->module * sizeof (ref_t)
+                             + roundup (db->head->module * sizeof (ref_t), ALIGN)
                              + new_data_size);
           if (newtotal > db->max_db_size)
             {

nscd/nscd.c

@@ -237 +237 @@
 
       if (chdir ("/") != 0)
         error (EXIT_FAILURE, errno,
-               _("cannot change current working cirectory to \"/\""));
+               _("cannot change current working directory to \"/\""));
 
       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
 

nscd/nscd-client.h

@@ -258 +258 @@
   const char *data;
   size_t mapsize;
   int counter;          /* > 0 indicates it is usable.  */
+  size_t datasize;
 };
 #define NO_MAPPING ((struct mapped_database *) -1l)
 

nscd/nscd_helper.c

@@ -290 +290 @@
       newp->data = ((char *) mapping + head.header_size
                     + roundup (head.module * sizeof (ref_t), ALIGN));
       newp->mapsize = size;
+      newp->datasize = head.data_size;
       /* Set counter to 1 to show it is usable.  */
       newp->counter = 1;
 
@@ -340 +341 @@
       /* If not mapped or timestamp not updated, request new map.  */
       if (cur == NULL
           || (cur->head->nscd_certainly_running == 0
-              && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
+              && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
+          || cur->head->data_size > cur->datasize)
         cur = get_mapping (type, name,
                            (struct mapped_database **) &mapptr->mapped);
 
@@ -365 +367 @@
                      const struct mapped_database *mapped)
 {
   unsigned long int hash = __nis_hash (key, keylen) % mapped->head->module;
+  size_t datasize = mapped->datasize;
 
   ref_t work = mapped->head->array[hash];
-  while (work != ENDREF)
+  while (work != ENDREF && work + sizeof (struct hashentry) <= datasize)
     {
       struct hashentry *here = (struct hashentry *) (mapped->data + work);
 
-      if (type == here->type && keylen == here->len
-          && memcmp (key, mapped->data + here->key, keylen) == 0)
+      if (type == here->type
+          && keylen == here->len
+          && here->key + here->len <= datasize
+          && memcmp (key, mapped->data + here->key, keylen) == 0
+          && here->packet + sizeof (struct datahead) <= datasize)
         {
           /* We found the entry.  Increment the appropriate counter.  */
           const struct datahead *dh
@@ -380 +386 @@
 
           /* See whether we must ignore the entry or whether something
              is wrong because garbage collection is in progress.  */
-          if (dh->usable && ((char *) dh + dh->allocsize
-                             <= (char *) mapped->head + mapped->mapsize))
+          if (dh->usable && here->packet + dh->allocsize <= datasize)
             return dh;
         }
 

posix/glob.c

@@ -1287 +1287 @@
               for (size_t i = 0; i < cur; ++i)
                 free (names->name[i]);
               names = names->next;
+              /* NB: we will not leak memory here if we exit without
+                 freeing the current block assigned to OLD.  At least
+                 the very first block is always allocated on the stack
+                 and this is the block assigned to OLD here.  */
               if (names == NULL)
-                break;
+                {
+                  assert (old == &init_names);
+                  break;
+                }
               cur = names->count;
               if (old == names_alloca)
                 names_alloca = names;
@@ -1306 +1313 @@
                 new_gl_pathv[pglob->gl_offs + pglob->gl_pathc++]
                   = names->name[i];
               names = names->next;
+              /* NB: we will not leak memory here if we exit without
+                 freeing the current block assigned to OLD.  At least
+                 the very first block is always allocated on the stack
+                 and this is the block assigned to OLD here.  */
               if (names == NULL)
-                break;
+                {
+                  assert (old == &init_names);
+                  break;
+                }
               cur = names->count;
               if (old == names_alloca)
                 names_alloca = names;

README

@@ -10 +10 @@
 implement the operating system behavior seen by user applications.
 In GNU/Hurd systems, it works with a microkernel and Hurd servers.
 
-Version 2.4 is the first release after a long period of development, and
-introduces changes to the API and a new ABI for all configurations.  It
-has been tested and deployed in new production systems, but should still
-be considered somewhat experimental.  The stable 2.3 release series
-continues to be maintained, and implements a widely-deployed ABI.
-Version 2.3.6 is available, and we will release 2.3.7 with more bug fixes.
-
 The GNU C Library implements much of the POSIX.1 functionality in the
 GNU/Hurd system, using configurations i[34567]86-*-gnu.
 

README.template

@@ -10 +10 @@
 implement the operating system behavior seen by user applications.
 In GNU/Hurd systems, it works with a microkernel and Hurd servers.
 
-Version 2.4 is the first release after a long period of development, and
-introduces changes to the API and a new ABI for all configurations.  It
-has been tested and deployed in new production systems, but should still
-be considered somewhat experimental.  The stable 2.3 release series
-continues to be maintained, and implements a widely-deployed ABI.
-Version 2.3.6 is available, and we will release 2.3.7 with more bug fixes.
-
 The GNU C Library implements much of the POSIX.1 functionality in the
 GNU/Hurd system, using configurations i[34567]86-*-gnu.
 

sysdeps/posix/getaddrinfo.c

@@ -1291 +1291 @@
   for (idx = 0; ; ++idx)
     {
       unsigned int bits = list[idx].bits;
-      uint8_t *mask = list[idx].prefix.s6_addr;
-      uint8_t *val = in6->sin6_addr.s6_addr;
+      const uint8_t *mask = list[idx].prefix.s6_addr;
+      const uint8_t *val = in6->sin6_addr.s6_addr;
 
       while (bits >= 8)
         {

sysdeps/unix/sysv/linux/sparc/sparc64/pause.c

@@ +1 @@
+#include <errno.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sysdep-cancel.h>
+
+#define __sigprocmask(how, set, oset) \
+  INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8)
+
 #include <sysdeps/posix/pause.c>