d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix: permit the creation of zero-sized sections.

Browse Source 
Obtained from:	elftoolchain
MFC after:		1 month
This commit is contained in:
Kai Wang 2010-07-21 09:27:16 +00:00
parent 49ca10d40c
commit c0308c2c84
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libelf/elf_update.c
View File

@ -534,22 +534,24 @@ _libelf_write_scn(Elf *e, char *nf, Elf_Scn *s, off_t rc)
int ec; int ec;
size_t fsz, msz, nobjects; size_t fsz, msz, nobjects;
uint32_t sh_type; uint32_t sh_type;
uint64_t sh_off; uint64_t sh_off, sh_size;
int elftype; int elftype;
Elf_Data *d, dst; Elf_Data *d, dst;
if ((ec = e->e_class) == ELFCLASS32) if ((ec = e->e_class) == ELFCLASS32) {
sh_type = s->s_shdr.s_shdr32.sh_type; sh_type = s->s_shdr.s_shdr32.sh_type;
else sh_size = (uint64_t) s->s_shdr.s_shdr32.sh_size;
} else {
sh_type = s->s_shdr.s_shdr64.sh_type; sh_type = s->s_shdr.s_shdr64.sh_type;
sh_size = s->s_shdr.s_shdr64.sh_size;
}
/* /*
* Ignore sections that do not allocate space in the file. * Ignore sections that do not allocate space in the file.
*/ */
if (sh_type == SHT_NOBITS || sh_type == SHT_NULL) if (sh_type == SHT_NOBITS || sh_type == SHT_NULL || sh_size == 0)
return (rc); return (rc);
elftype = _libelf_xlate_shtype(sh_type); elftype = _libelf_xlate_shtype(sh_type);
assert(elftype >= ELF_T_FIRST && elftype <= ELF_T_LAST); assert(elftype >= ELF_T_FIRST && elftype <= ELF_T_LAST);