mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-15 04:20:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ld-address format-truncation error.

Browse Source 
With the elf/sotruss-lib.c failure fixed, building 64-bit glibc with
GCC mainline fails with another format-truncation error in
locale/programs/ld-address.c, where 11 bytes are allocated for a
buffer to print a long int value.

This patch changes that code to allocate 21 bytes.  Treating this
value as signed is questionable and I don't think large values are
actually useful here, but I think those can be considered as instances
of bug 21036 which I've filed for overflow checks for numeric values
in localedef in general, and don't need to be addressed to fix the
build.

Tested with GCC mainline with compilation for aarch64 with
build-many-glibcs.py, and with glibc testsuite for x86_64 (built with
GCC 6).

(Note that while this fixes the build of 64-bit glibc with GCC
mainline, further fixes will be needed to get the testsuite building
with GCC mainline again.)

	* locale/programs/ld-address.c (INT_STR_ELEM): Increase size of
	buffer used to print long int value.
This commit is contained in:
Joseph Myers 2017-01-11 13:59:01 +00:00
parent 38d01bd6df
commit 436cfba0ab
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2017-01-11 Joseph Myers <joseph@codesourcery.com> 2017-01-11 Joseph Myers <joseph@codesourcery.com>
* locale/programs/ld-address.c (INT_STR_ELEM): Increase size of
buffer used to print long int value.
* elf/sotruss-lib.c (init): Increase space allocated for pid by * elf/sotruss-lib.c (init): Increase space allocated for pid by
one byte. Print it with %ld, cast to long int. one byte. Print it with %ld, cast to long int.

4
locale/programs/ld-address.c
View File

@ -485,8 +485,8 @@ address_read (struct linereader *ldfile, struct localedef_t *result,
address->cat = arg->val.str.startmb; \ address->cat = arg->val.str.startmb; \
else \ else \
{ \ { \
char *numbuf = (char *) xmalloc (11); \ char *numbuf = (char *) xmalloc (21); \
snprintf (numbuf, 11, "%ld", arg->val.num); \ snprintf (numbuf, 21, "%ld", arg->val.num); \
address->cat = numbuf; \ address->cat = numbuf; \
} \ } \
} \ } \