RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-05-05 01:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

lookup: Simplify first loop in symtab_read()

Browse Source 
symtab_read() is quite fragile because it relies on the fact that the
first and second loops have the exact same conditions.

Instead just change the first loop to count all the lines in the file,
to get an upper bound for allocation.  It's ok to over-allocate
slightly.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
This commit is contained in:
Josh Poimboeuf 2020-04-06 15:01:26 -05:00
parent 74c9c99931
commit 7e48138185
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kpatch-build/lookup.c
View File

@ -201,37 +201,28 @@ static void symtab_read(struct lookup_table *table, char *path)
{
FILE *file;
long unsigned int value;
unsigned int i = 0;
int alloc_nr = 0, i = 0;
int matched;
char line[256], name[256], size[16], type[16], bind[16], ndx[16];
if ((file = fopen(path, "r")) == NULL)
ERROR("fopen");
while (fgets(line, 256, file)) {
matched = sscanf(line, "%*s %lx %s %s %s %*s %s %s\n",
&value, size, type, bind, ndx, name);
/*
* First, get an upper limit on the number of entries for allocation
* purposes:
*/
while (fgets(line, 256, file))
alloc_nr++;
if (matched == 5) {
name[0] = '\0';
matched++;
}
if (matched != 6 ||
!strcmp(ndx, "UND") ||
!strcmp(type, "SECTION"))
continue;
table->obj_nr++;
}
table->obj_syms = malloc(table->obj_nr * sizeof(*table->obj_syms));
table->obj_syms = malloc(alloc_nr * sizeof(*table->obj_syms));
if (!table->obj_syms)
ERROR("malloc table.obj_syms");
memset(table->obj_syms, 0, table->obj_nr * sizeof(*table->obj_syms));
memset(table->obj_syms, 0, alloc_nr * sizeof(*table->obj_syms));
rewind(file);
/* Now read the actual entries: */
while (fgets(line, 256, file)) {
matched = sscanf(line, "%*s %lx %s %s %s %*s %s %s\n",
&value, size, type, bind, ndx, name);
@ -274,9 +265,12 @@ static void symtab_read(struct lookup_table *table, char *path)
table->obj_syms[i].name = strdup(name);
if (!table->obj_syms[i].name)
ERROR("strdup");
i++;
}
table->obj_nr = i;
fclose(file);
}