diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | libio/Makefile | 2 | ||||
| -rw-r--r-- | libio/bug-fseek.c | 94 | ||||
| -rw-r--r-- | libio/fileops.c | 10 | ||||
| -rw-r--r-- | locale/hashval.h | 10 | ||||
| -rw-r--r-- | locale/programs/locarchive.c | 2 | ||||
| -rw-r--r-- | locale/programs/simple-hash.c | 4 |
7 files changed, 135 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 8c648502d1..bfa4550724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2002-07-24 Ulrich Drepper <drepper@redhat.com> + + * locale/hashval.h: Make more self-containedby defining LONG_BITS. + * locale/programs/simple-hash.c: Remove LONG_BITS definition. + + * locale/programs/locarchive.c (add_locale_to_archive): Correct + test to detect duplicate locales. + + * libio/fileops.c (_IO_new_file_seekoff): Fail if relative + position would be before beginning of file. + (_IO_file_seekoff_mmap): Likewise. + * libio/Makefile (tests): Add bug-fseek. + * libio/bug-fseek.c: New file. + + * intl/explodename.c: Remove support for CEN-style locale variables. + It was never used and shouldn't be since it's not portable. + * intl/finddomain.c: Likewise. + * intl/l10nflist.c: Likewise. + * intl/loadinfo.h: Likewise. + * locale/findlocale.c: Likewise. + 2002-07-24 Roland McGrath <roland@frob.com> * libio/fileops.c (_IO_file_seekoff_mmap): When just examining the diff --git a/libio/Makefile b/libio/Makefile index d10d6c1648..132634608f 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -50,7 +50,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-fopenloc \ tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf \ tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof \ - tst-freopen bug-rewind bug-ungetc + tst-freopen bug-rewind bug-ungetc bug-fseek test-srcs = test-freopen all: # Make this the default target; it will be defined in Rules. diff --git a/libio/bug-fseek.c b/libio/bug-fseek.c new file mode 100644 index 0000000000..d8cd712f6a --- /dev/null +++ b/libio/bug-fseek.c @@ -0,0 +1,94 @@ +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + + +static char *fname; + + +static void do_prepare (void); +#define PREPARE(argc, argv) do_prepare () +static int do_test (void); +#define TEST_FUNCTION do_test () +#include <test-skeleton.c> + + +static void +do_prepare (void) +{ + static const char pattern[] = "12345678901234567890"; + int fd = create_temp_file ("bug-fseek.", &fname); + if (fd == -1) + { + printf ("cannot create temporary file: %m\n"); + exit (1); + } + + if (write (fd, pattern, sizeof (pattern)) != sizeof (pattern)) + { + perror ("short write"); + abort (); + } + close (fd); +} + + + +static int +do_test (void) +{ + FILE *f; + int result = 0; + char buf[10]; + + + if ((f = fopen (fname, "r")) == (FILE *) NULL) + { + perror ("fopen(\"r\")"); + } + + fread (buf, 3, 1, f); + errno = 0; + if (fseek (f, -10, SEEK_CUR) == 0) + { + printf ("fseek() for r to before start of file worked!\n"); + result = 1; + } + else if (errno != EINVAL) + { + printf ("\ +fseek() for r to before start of file did not set errno to EINVAL. \ +Got %d instead\n", + errno); + result = 1; + } + + fclose (f); + + + if ((f = fopen (fname, "r+")) == (FILE *) NULL) + { + perror ("fopen(\"r+\")"); + } + + fread (buf, 3, 1, f); + errno = 0; + if (fseek (f, -10, SEEK_CUR) == 0) + { + printf ("fseek() for r+ to before start of file worked!\n"); + result = 1; + } + else if (errno != EINVAL) + { + printf ("\ +fseek() for r+ to before start of file did not set errno to EINVAL. \ +Got %d instead\n", + errno); + result = 1; + } + + fclose (f); + + return result; +} diff --git a/libio/fileops.c b/libio/fileops.c index fa4c8e0fa8..1794dce57f 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -778,6 +778,11 @@ _IO_new_file_seekoff (fp, offset, dir, mode) goto dumb; /* Make offset absolute, assuming current pointer is file_ptr(). */ offset += fp->_offset; + if (offset < 0) + { + __set_errno (EINVAL); + return EOF; + } dir = _IO_seek_set; break; @@ -934,6 +939,11 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode) case _IO_seek_cur: /* Adjust for read-ahead (bytes is buffer). */ offset += fp->_IO_read_ptr - fp->_IO_read_base; + if (offset < 0) + { + __set_errno (EINVAL); + return EOF; + } break; case _IO_seek_set: break; diff --git a/locale/hashval.h b/locale/hashval.h index 15ec1244cf..e35957dde3 100644 --- a/locale/hashval.h +++ b/locale/hashval.h @@ -18,7 +18,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -unsigned long +#ifndef LONGBITS +# define LONGBITS (sizeof (long int) * BITSPERBYTE) +#endif + +unsigned long int compute_hashval (const void *key, size_t keylen); + +unsigned long int compute_hashval (key, keylen) const void *key; size_t keylen; @@ -37,5 +43,5 @@ compute_hashval (key, keylen) hval = (hval << 9) | (hval >> (LONGBITS - 9)); hval += (unsigned long int) *(((char *) key) + cnt++); } - return hval != 0 ? hval : ~((unsigned long) 0); + return hval != 0 ? hval : ~((unsigned long int) 0); } diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 9ef373a2e5..de026b2a74 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -531,7 +531,7 @@ add_locale_to_archive (ah, name, data, replace) (char *) ah->addr + namehashtab[idx].name_offset) == 0) { /* Found the entry. */ - if (! replace) + if (namehashtab[idx].locrec_offset != 0 && ! replace) { if (! be_quiet) error (0, 0, _("locale '%s' already exists"), name); diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c index b52b5593d0..c319068677 100644 --- a/locale/programs/simple-hash.c +++ b/locale/programs/simple-hash.c @@ -46,10 +46,6 @@ # define BITSPERBYTE 8 #endif -#ifndef LONGBITS -# define LONGBITS (sizeof (long) * BITSPERBYTE) -#endif - #ifndef bcopy # define bcopy(s, d, n) memcpy ((d), (s), (n)) #endif |