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

Use the reentrant versions of strtok() and gmtime() (#79) r=mmentovai

Browse Source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@69 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
bryner 2006-11-20 20:58:10 +00:00
parent 7a983e94d0
commit 042ca733d3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/processor/minidump.cc
View File

@ -2304,10 +2304,10 @@ void Minidump::Print() {
printf(" stream_count = %d\n", header_.stream_count); printf(" stream_count = %d\n", header_.stream_count);
printf(" stream_directory_rva = 0x%x\n", header_.stream_directory_rva); printf(" stream_directory_rva = 0x%x\n", header_.stream_directory_rva);
printf(" checksum = 0x%x\n", header_.checksum); printf(" checksum = 0x%x\n", header_.checksum);
struct tm* timestruct = struct tm timestruct;
gmtime(reinterpret_cast<time_t*>(&header_.time_date_stamp)); gmtime_r(reinterpret_cast<time_t*>(&header_.time_date_stamp), &timestruct);
char timestr[20]; char timestr[20];
strftime(timestr, 20, "%Y-%m-%d %H:%M:%S", timestruct); strftime(timestr, 20, "%Y-%m-%d %H:%M:%S", &timestruct);
printf(" time_date_stamp = 0x%x %s\n", header_.time_date_stamp, printf(" time_date_stamp = 0x%x %s\n", header_.time_date_stamp,
timestr); timestr);
printf(" flags = 0x%llx\n", header_.flags); printf(" flags = 0x%llx\n", header_.flags);

7
src/processor/source_line_resolver.cc
View File

@ -365,16 +365,17 @@ bool SourceLineResolver::Module::Tokenize(char *line, int max_tokens,
// Split tokens on the space character. Look for newlines too to // Split tokens on the space character. Look for newlines too to
// strip them out before exhausting max_tokens. // strip them out before exhausting max_tokens.
char *token = strtok(line, " \r\n"); char *save_ptr;
char *token = strtok_r(line, " \r\n", &save_ptr);
while (token && --remaining > 0) { while (token && --remaining > 0) {
tokens->push_back(token); tokens->push_back(token);
if (remaining > 1) if (remaining > 1)
token = strtok(NULL, " \r\n"); token = strtok_r(NULL, " \r\n", &save_ptr);
} }
// If there's anything left, just add it as a single token. // If there's anything left, just add it as a single token.
if (!remaining > 0) { if (!remaining > 0) {
if ((token = strtok(NULL, "\r\n"))) { if ((token = strtok_r(NULL, "\r\n", &save_ptr))) {
tokens->push_back(token); tokens->push_back(token);
} }
} }