ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Check for string pointer being outside of the string table. 

- Only parse typedefs on stabs entries that can have them.
This commit is contained in:
Robert Shearman 2004-10-04 19:31:05 +00:00 committed by Alexandre Julliard
parent be7c95a3e5
commit 20546c84bb
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/dbghelp/stabs.c
View File

@ -1094,6 +1094,7 @@ BOOL stabs_parse(struct module* module, const char* addr,
unsigned int stabbufflen; unsigned int stabbufflen;
const struct stab_nlist* stab_ptr; const struct stab_nlist* stab_ptr;
const char* strs; const char* strs;
const char* strs_end;
int strtabinc; int strtabinc;
char symname[4096]; char symname[4096];
unsigned incl[32]; unsigned incl[32];
@ -1107,6 +1108,7 @@ BOOL stabs_parse(struct module* module, const char* addr,
nstab = stablen / sizeof(struct stab_nlist); nstab = stablen / sizeof(struct stab_nlist);
stab_ptr = (const struct stab_nlist*)(addr + staboff); stab_ptr = (const struct stab_nlist*)(addr + staboff);
strs = (const char*)(addr + strtaboff); strs = (const char*)(addr + strtaboff);
strs_end = strs + strtablen;
memset(srcpath, 0, sizeof(srcpath)); memset(srcpath, 0, sizeof(srcpath));
memset(stabs_basic, 0, sizeof(stabs_basic)); memset(stabs_basic, 0, sizeof(stabs_basic));
@ -1123,6 +1125,11 @@ BOOL stabs_parse(struct module* module, const char* addr,
for (i = 0; i < nstab; i++, stab_ptr++) for (i = 0; i < nstab; i++, stab_ptr++)
{ {
ptr = strs + stab_ptr->n_un.n_strx; ptr = strs + stab_ptr->n_un.n_strx;
if ((ptr > strs_end) || (ptr + strlen(ptr) > strs_end))
{
WARN("Bad stabs string %p\n", ptr);
continue;
}
if (ptr[strlen(ptr) - 1] == '\\') if (ptr[strlen(ptr) - 1] == '\\')
{ {
/* /*
@ -1145,23 +1152,33 @@ BOOL stabs_parse(struct module* module, const char* addr,
ptr = stabbuff; ptr = stabbuff;
} }
if (strchr(ptr, '=') != NULL) /* only symbol entries contain a typedef */
switch (stab_ptr->n_type)
{ {
/* case N_GSYM:
* The stabs aren't in writable memory, so copy it over so we are case N_LCSYM:
* sure we can scribble on it. case N_STSYM:
*/ case N_RSYM:
if (ptr != stabbuff) case N_LSYM:
case N_ROSYM:
if (strchr(ptr, '=') != NULL)
{ {
strcpy(stabbuff, ptr); /*
ptr = stabbuff; * The stabs aren't in writable memory, so copy it over so we are
} * sure we can scribble on it.
stab_strcpy(symname, sizeof(symname), ptr); */
if (!stabs_parse_typedef(module, ptr, symname)) if (ptr != stabbuff)
{ {
/* skip this definition */ strcpy(stabbuff, ptr);
stabbuff[0] = '\0'; ptr = stabbuff;
continue; }
stab_strcpy(symname, sizeof(symname), ptr);
if (!stabs_parse_typedef(module, ptr, symname))
{
/* skip this definition */
stabbuff[0] = '\0';
continue;
}
} }
} }