generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore functions that have invalid addresses or sizes, instead of aborting the

Browse Source 
symbol file load (#137).   r=mmentovai.


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@130 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
bryner
2007-03-22 23:20:17 +00:00
parent 6bc866cc82
commit 809f0cb858
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/processor/basic_source_line_resolver.cc
View File

@@ -226,7 +226,7 @@ bool BasicSourceLineResolver::Module::LoadMap(const string &map_file) {
// lines, which might be present for FUNC lines of highly-templatized
// code.
char buffer[8192];
Function *cur_func = NULL;
linked_ptr<Function> cur_func;
while (fgets(buffer, sizeof(buffer), f)) {
if (strncmp(buffer, "FILE ", 5) == 0) {
@@ -236,17 +236,17 @@ bool BasicSourceLineResolver::Module::LoadMap(const string &map_file) {
return false;
}
} else if (strncmp(buffer, "FUNC ", 5) == 0) {
cur_func = ParseFunction(buffer);
if (!cur_func) {
return false;
}
if (!functions_.StoreRange(cur_func->address, cur_func->size,
linked_ptr<Function>(cur_func))) {
cur_func.reset(ParseFunction(buffer));
if (!cur_func.get()) {
return false;
}
// StoreRange will fail if the function has an invalid address or size.
// We'll silently ignore this, the function and any corresponding lines
// will be destroyed when cur_func is released.
functions_.StoreRange(cur_func->address, cur_func->size, cur_func);
} else if (strncmp(buffer, "PUBLIC ", 7) == 0) {
// Clear cur_func: public symbols don't contain line number information.
cur_func = NULL;
cur_func.reset();
if (!ParsePublicSymbol(buffer)) {
return false;
@@ -259,7 +259,7 @@ bool BasicSourceLineResolver::Module::LoadMap(const string &map_file) {
//
// MODULE <guid> <age> <filename>
} else {
if (!cur_func) {
if (!cur_func.get()) {
return false;
}
Line *line = ParseLine(buffer);