AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-10 03:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* locale/lc-time.c (_nl_init_era_entries): Correct allocation of
	memory for eras.
	Patch by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
This commit is contained in:
Ulrich Drepper 2000-03-17 05:33:30 +00:00
parent 19cf43bed6
commit 0db0e14977
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-03-16 Ulrich Drepper <drepper@redhat.com>
* locale/lc-time.c (_nl_init_era_entries): Correct allocation of
memory for eras.
Patch by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
* elf/Makefile: Add rules to compile and rune constload1 test.
* elf/constload1.c: New file.
* elf/constload2.c: New file.

11
locale/lc-time.c
View File

@ -1,5 +1,5 @@
/* Define current locale data for LC_TIME category.
Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1995-1999, 2000 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
@ -78,8 +78,9 @@ _nl_init_era_entries (void)
else
{
if (num_eras != new_num_eras)
eras = realloc (eras,
new_num_eras * sizeof (struct era_entry *));
eras = (struct era_entry *) realloc (eras,
new_num_eras
* sizeof (struct era_entry));
if (eras == NULL)
{
num_eras = 0;
@ -93,8 +94,8 @@ _nl_init_era_entries (void)
for (cnt = 0; cnt < num_eras; ++cnt)
{
const char *base_ptr = ptr;
memcpy((void*)(eras + cnt), (const void *) ptr,
sizeof (uint32_t) * 8);
memcpy ((void *) (eras + cnt), (const void *) ptr,
sizeof (uint32_t) * 8);
if (ERA_DATE_CMP(eras[cnt].start_date,
eras[cnt].stop_date))