wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 855823 - Rely on breakpad finding file ids itself instead of relying on AddLibraryMapping caller to provide them. r=ted

Browse Source
This commit is contained in:
Mike Hommey 2013-04-09 14:04:53 +02:00
parent 8169d626a4
commit 864ce294ff
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -90,6 +90,9 @@ using mozilla::InjectCrashRunnable;
#if defined(XP_MACOSX)
CFStringRef reporterClientAppID = CFSTR("org.mozilla.crashreporter");
#endif
#if defined(MOZ_WIDGET_ANDROID)
#include "common/linux/file_id.h"
#endif
#include "nsIUUIDGenerator.h"
@ -347,30 +350,12 @@ static posix_spawnattr_t spawnattr;
// libraries that are mapped into anonymous mappings.
typedef struct {
std::string name;
std::string debug_id;
uintptr_t start_address;
size_t length;
size_t file_offset;
} mapping_info;
static std::vector<mapping_info> library_mappings;
typedef std::map<uint32_t,google_breakpad::MappingList> MappingMap;
void FileIDToGUID(const char* file_id, u_int8_t guid[sizeof(MDGUID)])
{
for (int i = 0; i < sizeof(MDGUID); i++) {
int c;
sscanf(file_id, "%02X", &c);
guid[i] = (u_int8_t)(c & 0xFF);
file_id += 2;
}
// GUIDs are stored in network byte order.
uint32_t* data1 = reinterpret_cast<uint32_t*>(guid);
*data1 = htonl(*data1);
uint16_t* data2 = reinterpret_cast<uint16_t*>(guid + 4);
*data2 = htons(*data2);
uint16_t* data3 = reinterpret_cast<uint16_t*>(guid + 6);
*data3 = htons(*data3);
}
#endif
#ifdef XP_LINUX
@ -1028,7 +1013,7 @@ nsresult SetExceptionHandler(nsIFile* aXREDirectory,
#if defined(MOZ_WIDGET_ANDROID)
for (unsigned int i = 0; i < library_mappings.size(); i++) {
u_int8_t guid[sizeof(MDGUID)];
FileIDToGUID(library_mappings[i].debug_id.c_str(), guid);
google_breakpad::FileID::ElfFileIdentifierFromMappedFile((void const *)library_mappings[i].start_address, guid);
gExceptionHandler->AddMappingInfo(library_mappings[i].name,
guid,
library_mappings[i].start_address,
@ -2824,7 +2809,6 @@ UnsetRemoteExceptionHandler()
#if defined(MOZ_WIDGET_ANDROID)
void AddLibraryMapping(const char* library_name,
const char* file_id,
uintptr_t start_address,
size_t mapping_length,
size_t file_offset)
@ -2832,7 +2816,6 @@ void AddLibraryMapping(const char* library_name,
if (!gExceptionHandler) {
mapping_info info;
info.name = library_name;
info.debug_id = file_id;
info.start_address = start_address;
info.length = mapping_length;
info.file_offset = file_offset;
@ -2840,7 +2823,7 @@ void AddLibraryMapping(const char* library_name,
}
else {
u_int8_t guid[sizeof(MDGUID)];
FileIDToGUID(file_id, guid);
google_breakpad::FileID::ElfFileIdentifierFromMappedFile((void const *)start_address, guid);
gExceptionHandler->AddMappingInfo(library_name,
guid,
start_address,

1
toolkit/crashreporter/nsExceptionHandler.h
View File

@ -186,7 +186,6 @@ bool UnsetRemoteExceptionHandler();
// info about the shared libraries that are mapped into these anonymous
// mappings.
void AddLibraryMapping(const char* library_name,
const char* file_id,
uintptr_t start_address,
size_t mapping_length,
size_t file_offset);

2
toolkit/xre/nsAndroidStartup.cpp
View File

@ -47,7 +47,7 @@ GeckoStart(void *data, const nsXREAppData *appData)
#ifdef MOZ_CRASHREPORTER
const struct mapping_info *info = getLibraryMapping();
while (info->name) {
CrashReporter::AddLibraryMapping(info->name, info->file_id, info->base,
CrashReporter::AddLibraryMapping(info->name, info->base,
info->len, info->offset);
info++;
}