aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-25 04:51:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-25 04:51:08 +0000
commit6dd67bd565db889944d740379e6ae87bd3fd4e44 (patch)
tree57e0f1549fe4d23dc1b6b6ba939904739d2f6a29 /locale
parent(MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. (diff)
downloadglibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.tar.gz
glibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.tar.bz2
glibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.zip
Update.
2002-08-24 Ulrich Drepper <drepper@redhat.com> * locale/programs/charmap.c (charmap_new_char): Don't use ULONG_MAX as maximum UCS4 value. * sysdeps/unix/sysv/linux/ia64/sys/user.h: New file. * sysdeps/generic/strtol.c: We don't need the isascii test in glibc. * malloc/hooks.c (public_sET_STATe): use size_t as type for i. * malloc/malloc.c (mALLINFo): Likewise. * libio/wstrops.c (_IO_wstr_pbackfail): Use WEOF in comparison. * libio/wfileops.c (_IO_wfile_overflow): Use EOF not WEOF when examining result of _IO_do_flush call. * stdio-common/vfprintf.c (vfprintf): Use correct type in va_arg. Use prec not spec when sizing buffers. * catgets/open_catalog.c (__open_catalog): Add casts to avoid warnings. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * stdio-common/vfscanf.c (inchar): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * elf/dl-misc.c (_dl_debug_vdprintf): Likewise. * elf/readlib.c (process_file): Likewise. * elf/sprof.c (load_profdata): Likewise. * sysdeps/ia64/hp-timing.h (HP_TIMING_PRINT): Likewise. * locale/programs/linereader.c (get_toplvl_escape): Likewise. * locale/programs/charmap.c (charmap_read): Likewise. * libio/fileops.c: Likewise. * libio/fmemopen.c: Likewise. * stdlib/strtod.c: Likewise. * elf/dl-load.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c (process_block): Likewise. * sysdeps/unix/sysv/linux/ia64/Makefile: Define _ASM_IA64_CURRENT_H macro to calm down the compiler. * iconv/gconv_cache.c (__gconv_load_cache): Add cast to avoid warning. * sysdeps/ia64/elf/initfini.c: Don't use newlines embedded in string. * sysdeps/unix/sysv/linux/i386/sysdep.S: Update comment regarding placement of errno definition. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/mips/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. * resolv/nss_dns/dns-host.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. 2002-08-16 Paul Eggert <eggert@twinsun.com> * resolv/gethnamaddr.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. * resolv/res_query.c (MAXPACKET): Likewise. architectures.
Diffstat (limited to 'locale')
-rw-r--r--locale/loadarchive.c2
-rw-r--r--locale/loadlocale.c4
-rw-r--r--locale/programs/charmap.c12
-rw-r--r--locale/programs/linereader.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index cad34b63e6..ef259b9bdb 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -373,7 +373,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
do
{
to = ranges[upper].from + ranges[upper].len;
- if (to > archive_stat.st_size)
+ if (to > (size_t) archive_stat.st_size)
/* The archive locrectab contains bogus offsets. */
return NULL;
to = (to + ps - 1) & ~(ps - 1);
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 14f3773c47..ebf25f33d1 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -1,5 +1,5 @@
/* Functions to read locale data files.
- Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+ Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -105,7 +105,7 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
for (cnt = 0; cnt < newdata->nstrings; ++cnt)
{
size_t idx = filedata->strindex[cnt];
- if (__builtin_expect (idx > newdata->filesize, 0))
+ if (__builtin_expect (idx > (size_t) newdata->filesize, 0))
{
puntdata:
free (newdata);
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 0aa623bf34..8612d99688 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -244,9 +244,9 @@ default character map file `%s' not found"), DEFAULT_CHARMAP));
do
{
- struct charseq * seq = charmap_find_symbol (result, p, 1);
+ struct charseq *seq = charmap_find_symbol (result, p, 1);
- if (seq == NULL || seq->ucs4 != *p)
+ if (seq == NULL || seq->ucs4 != (uint32_t) *p)
failed = 1;
}
while (*p++ != '\0');
@@ -962,7 +962,7 @@ charmap_new_char (struct linereader *lr, struct charmap_t *cm,
errno = 0;
newp->ucs4 = strtoul (from + 1, &endp, 16);
if (endp - from != len1
- || (newp->ucs4 == ULONG_MAX && errno == ERANGE)
+ || (newp->ucs4 == ~((uint32_t) 0) && errno == ERANGE)
|| newp->ucs4 >= 0x80000000)
/* This wasn't successful. Signal this name cannot be a
correct UCS value. */
@@ -1008,9 +1008,9 @@ hexadecimal range format should use only capital characters"));
errno = 0;
from_nr = strtoul (&from[prefix_len], &from_end, decimal_ellipsis ? 10 : 16);
- if (*from_end != '\0' || (from_nr == ULONG_MAX && errno == ERANGE)
+ if (*from_end != '\0' || (from_nr == UINT_MAX && errno == ERANGE)
|| ((to_nr = strtoul (&to[prefix_len], &to_end,
- decimal_ellipsis ? 10 : 16)) == ULONG_MAX
+ decimal_ellipsis ? 10 : 16)) == UINT_MAX
&& errno == ERANGE)
|| *to_end != '\0')
{
@@ -1057,7 +1057,7 @@ hexadecimal range format should use only capital characters"));
errno = 0;
newp->ucs4 = strtoul (name_end + 1, &endp, 16);
if (endp - name_end != len1
- || (newp->ucs4 == ULONG_MAX && errno == ERANGE)
+ || (newp->ucs4 == ~((uint32_t) 0) && errno == ERANGE)
|| newp->ucs4 >= 0x80000000)
/* This wasn't successful. Signal this name cannot be a
correct UCS value. */
diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index e21616538f..2c6eb8d3fe 100644
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -381,7 +381,7 @@ get_toplvl_escape (struct linereader *lr)
bytes[nbytes++] = byte;
}
while (ch == lr->escape_char
- && nbytes < sizeof (lr->token.val.charcode.bytes));
+ && nbytes < (int) sizeof (lr->token.val.charcode.bytes));
if (!isspace (ch))
lr_error (lr, _("garbage at end of character code specification"));