lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

[BZ #346]

Browse Source 
Update.
	* libio/vasprintf.c (_IO_vasprintf): Fix condition to decide
	whether to realloc or not.
	Reported by Pavel Kankovsky <peak@argo.troja.mff.cuni.cz> [BZ #346].
This commit is contained in:
Ulrich Drepper
2004-09-26 05:11:53 +00:00
parent ac5e137cd9
commit 5cec9552a6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-09-25 Ulrich Drepper <drepper@redhat.com> 2004-09-25 Ulrich Drepper <drepper@redhat.com>
* libio/vasprintf.c (_IO_vasprintf): Fix condition to decide
whether to realloc or not.
Reported by Pavel Kankovsky <peak@argo.troja.mff.cuni.cz> [BZ #346].
* intl/dcigettext.c (DCIGETTEXT): Protect tfind/tsearch calls. * intl/dcigettext.c (DCIGETTEXT): Protect tfind/tsearch calls.
* intl/dcigettext.c (_nl_find_msg): Call _nl_load_domain also if * intl/dcigettext.c (_nl_find_msg): Call _nl_load_domain also if
decided < 0. decided < 0.

8
libio/vasprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1997,1999,2000,2001,2002 Free Software Foundation, Inc. /* Copyright (C) 1995,1997,1999-2002,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -64,11 +64,11 @@ _IO_vasprintf (result_ptr, format, args)
free (sf._sbf._f._IO_buf_base); free (sf._sbf._f._IO_buf_base);
return ret; return ret;
} }
/* Only use realloc if the size we need is of the same order of /* Only use realloc if the size we need is of the same (binary)
magnitude then the memory we allocated. */ order of magnitude then the memory we allocated. */
needed = sf._sbf._f._IO_write_ptr - sf._sbf._f._IO_write_base + 1; needed = sf._sbf._f._IO_write_ptr - sf._sbf._f._IO_write_base + 1;
allocated = sf._sbf._f._IO_write_end - sf._sbf._f._IO_write_base; allocated = sf._sbf._f._IO_write_end - sf._sbf._f._IO_write_base;
if ((allocated << 1) <= needed) if ((allocated >> 1) <= needed)
*result_ptr = (char *) realloc (sf._sbf._f._IO_buf_base, needed); *result_ptr = (char *) realloc (sf._sbf._f._IO_buf_base, needed);
else else
{ {