qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* locale/programs/ld-time.c (TESTARR_ELEM): Make i unsigned.
	(time_output): If necessary, allocate new buffer for .name string if
	padding is required.
This commit is contained in:
Ulrich Drepper 2003-04-17 02:55:45 +00:00
parent 31dfab9e17
commit 86d273076c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2003-04-16 Ulrich Drepper <drepper@redhat.com> 2003-04-16 Ulrich Drepper <drepper@redhat.com>
* locale/programs/ld-time.c (TESTARR_ELEM): Make i unsigned.
(time_output): If necessary, allocate new buffer for .name string if
padding is required.
* sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs): Check lengths * sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs): Check lengths
before copying. This might leave holes in the list. Adjust before copying. This might leave holes in the list. Adjust
pointers if necessary. pointers if necessary.

11
locale/programs/ld-time.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. /* Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@ -170,7 +170,7 @@ No definition for %s category found"), "LC_TIME"));
if (!time->cat##_defined) \ if (!time->cat##_defined) \
{ \ { \
const char *initval[] = { noparen val }; \ const char *initval[] = { noparen val }; \
int i; \ unsigned int i; \
\ \
if (! be_quiet && ! nothing) \ if (! be_quiet && ! nothing) \
WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \ WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' not defined"), \
@ -697,10 +697,13 @@ time_output (struct localedef_t *locale, const struct charmap_t *charmap,
iov[2 + cnt].iov_len = sizeof (int32_t); iov[2 + cnt].iov_len = sizeof (int32_t);
++cnt; ++cnt;
l = (strchr (time->era_entries[num].format, '\0') l = ((char *) rawmemchr (time->era_entries[num].format, '\0')
- time->era_entries[num].name) + 1; - time->era_entries[num].name) + 1;
l = (l + 3) & ~3; l = (l + 3) & ~3;
iov[2 + cnt].iov_base = (void *) time->era_entries[num].name; iov[2 + cnt].iov_base = alloca (l);
/* This time we *really* want to use the properties of strncpy. */
strncpy (iov[2 + cnt].iov_base, time->era_entries[num].name,
l);
iov[2 + cnt].iov_len = l; iov[2 + cnt].iov_len = l;
++cnt; ++cnt;