mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-11 09:19:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

always read header files with poorly chosen sizes

Browse Source 
From-SVN: r36163
This commit is contained in:
Bruce Korb 2000-09-05 18:29:56 +00:00 committed by Bruce Korb
parent 0bb06853c3
commit a6efbeceaa
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2000-09-05 Bruce Korb <bkorb@gnu.org>
* gcc/fixinc/fixincl.c(load_file): always read header files
with sizes that are a multiple of the page size.
2000-09-05 Alexandre Oliva <aoliva@redhat.com>
* gcse.c (hash_string_1): Add prototype.

14
gcc/fixinc/fixincl.c
View File

@ -338,6 +338,10 @@ load_file ( fname )
if (stbf.st_size == 0)
return (char*)NULL;
/* Make the data map size one larger than the file size for documentation
purposes. Truth is that there will be a following NUL character if
the file size is not a multiple of the page size. If it is a multiple,
then this adjustment sometimes fails anyway. */
data_map_size = stbf.st_size+1;
data_map_fd = open (fname, O_RDONLY);
ttl_data_size += data_map_size-1;
@ -352,8 +356,14 @@ load_file ( fname )
#ifdef HAVE_MMAP_FILE
curr_data_mapped = BOOL_TRUE;
res = (char*)mmap ((void*)NULL, data_map_size, PROT_READ, MAP_PRIVATE,
data_map_fd, 0);
/* IF the file size is a multiple of the page size,
THEN sometimes you will seg fault trying to access a trailing byte */
if ((stbf.st_size & (PAGESIZE-1)) == 0)
res = (char*)BAD_ADDR;
else
res = (char*)mmap ((void*)NULL, data_map_size, PROT_READ,
MAP_PRIVATE, data_map_fd, 0);
if (res == (char*)BAD_ADDR)
{
curr_data_mapped = BOOL_FALSE;