Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make trace-malloc dumps not print '(nil)' instead of an address. b=331743 (fixing regression from previous patch)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@220108 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2007-02-14 07:07:51 +00:00
parent 9940bb454e
commit 503c8f5296
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/tools/trace-malloc/adreader.cpp
View File

@@ -80,12 +80,14 @@ ADLog::Read(const char* aFileName)
return false;
}
char *data = (char*)malloc(((datasize+3)/4)*4);
size_t data_mem_size = ((datasize + sizeof(unsigned long) - 1) /
sizeof(unsigned long)) * sizeof(unsigned long);
char *data = (char*)malloc(data_mem_size);
for (char *cur_data = data,
*cur_data_end = data + ((datasize+3)/4)*4;
cur_data != cur_data_end; cur_data += 4) {
res = fscanf(in, " %x\n", (unsigned int*)cur_data);
for (unsigned long *cur_data = (unsigned long*) data,
*cur_data_end = (unsigned long*) ((char*)data + data_mem_size);
cur_data != cur_data_end; ++cur_data) {
res = fscanf(in, " %lX\n", cur_data);
if (res != 1) {
return false;
}