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

Previously, the ELF linker would always just store the pointer to a

Browse Source 
filename passed in via the module loader functions in the GDB
"sharedlibrary" support structures.  This isn't good, since the pointer
would become stale in almost every case (not the pre-loaded case, of
course).

Change this to malloc()ed copy of the string and finally fix the reason
that gdb -k's "sharedlibrary" command stopped working.

Obtained from:	LOMAC/FreeBSD (cf. NAI Labs)
This commit is contained in:
Brian Feldman 2001-08-06 14:21:57 +00:00
parent f47a6dce89
commit bcc92693d4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/link_elf.c
View File

@ -530,6 +530,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
int symstrindex;
int symcnt;
int strcnt;
char *newfilename;
GIANT_REQUIRED;
@ -788,7 +789,9 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
#ifdef DDB
GDB_STATE(RT_ADD);
ef->gdb.l_addr = lf->address;
ef->gdb.l_name = filename;
newfilename = malloc(strlen(filename) + 1, M_LINKER, M_WAITOK);
strcpy(newfilename, filename);
ef->gdb.l_name = (const char *)newfilename;
ef->gdb.l_ld = ef->dynamic;
link_elf_add_gdb(&ef->gdb);
GDB_STATE(RT_CONSISTENT);
@ -819,6 +822,7 @@ link_elf_unload_file(linker_file_t file)
#ifdef DDB
if (ef->gdb.l_ld) {
GDB_STATE(RT_DELETE);
free((void *)ef->gdb.l_name, M_LINKER);
link_elf_delete_gdb(&ef->gdb);
GDB_STATE(RT_CONSISTENT);
}

6
sys/kern/link_elf_obj.c
View File

@ -530,6 +530,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
int symstrindex;
int symcnt;
int strcnt;
char *newfilename;
GIANT_REQUIRED;
@ -788,7 +789,9 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu
#ifdef DDB
GDB_STATE(RT_ADD);
ef->gdb.l_addr = lf->address;
ef->gdb.l_name = filename;
newfilename = malloc(strlen(filename) + 1, M_LINKER, M_WAITOK);
strcpy(newfilename, filename);
ef->gdb.l_name = (const char *)newfilename;
ef->gdb.l_ld = ef->dynamic;
link_elf_add_gdb(&ef->gdb);
GDB_STATE(RT_CONSISTENT);
@ -819,6 +822,7 @@ link_elf_unload_file(linker_file_t file)
#ifdef DDB
if (ef->gdb.l_ld) {
GDB_STATE(RT_DELETE);
free((void *)ef->gdb.l_name, M_LINKER);
link_elf_delete_gdb(&ef->gdb);
GDB_STATE(RT_CONSISTENT);
}