Skip to content

Fix #91, Redo SymbolNames malloc to remove out-of-bounds write #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thnkslprpt wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −7
Open

Fix #91, Redo SymbolNames malloc to remove out-of-bounds write #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions elf2cfetbl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,6 @@ int32 GetSymbol(int32 SymbolIndex, union Elf_Sym *Symbol)
uint64_t calculated_offset = SymbolTableDataOffset + (SymbolIndex * SymbolTableEntrySize);
int32_t SeekOffset = (int32_t)calculated_offset;
char VerboseStr[60];
int32 i = 0;

memset(VerboseStr, 0, sizeof(VerboseStr));

Expand Down Expand Up @@ -1928,14 +1927,11 @@ int32 GetSymbol(int32 SymbolIndex, union Elf_Sym *Symbol)
printf(" st_name = 0x%08x - ", get_st_name(Symbol));
fseek(SrcFileDesc, SeekOffset, SEEK_SET);

while ((i < sizeof(VerboseStr)) && ((VerboseStr[i] = fgetc(SrcFileDesc)) != '\0'))
{
i++;
}
/* Ensure null terminated */
VerboseStr[sizeof(VerboseStr) - 1] = '\0';

VerboseStr[i] = '\0'; /* Just in case i=sizeof(VerboseStr) */
SymbolNames[SymbolIndex] = malloc(strlen(VerboseStr) + 1);

SymbolNames[SymbolIndex] = malloc(i + 1);
strcpy(SymbolNames[SymbolIndex], VerboseStr);

if ((strcmp(VerboseStr, TBL_DEF_SYMBOL_NAME) == 0) || (strcmp(&VerboseStr[1], TBL_DEF_SYMBOL_NAME) == 0))
Expand Down