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 778671: Fix two crashes in Telemetry. r=espindola

Browse Source
This commit is contained in:
Vladan Djeric 2012-08-31 15:20:20 -04:00
parent ebcaaebdbd
commit b37b90faa3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/telemetry/Telemetry.cpp
View File

@ -1395,8 +1395,7 @@ TelemetryImpl::RecordSlowStatement(const nsACString &sql,
const nsACString &dbName,
uint32_t delay)
{
MOZ_ASSERT(sTelemetry);
if (!sTelemetry->mCanRecord)
if (!sTelemetry || !sTelemetry->mCanRecord)
return;
nsCAutoString fullSQL(sql);
@ -1421,10 +1420,8 @@ void
TelemetryImpl::RecordChromeHang(uint32_t duration,
Telemetry::ProcessedStack &aStack)
{
MOZ_ASSERT(sTelemetry);
if (!sTelemetry->mCanRecord) {
if (!sTelemetry || !sTelemetry->mCanRecord)
return;
}
MutexAutoLock hangReportMutex(sTelemetry->mHangReportsMutex);
@ -1432,8 +1429,7 @@ TelemetryImpl::RecordChromeHang(uint32_t duration,
if (sTelemetry->mHangReports.Length()) {
Telemetry::ProcessedStack &firstStack =
sTelemetry->mHangReports[0].mStack;
const uint32_t moduleCount = aStack.GetNumModules();
for (size_t i = 0; i < moduleCount; ++i) {
for (size_t i = 0; i < aStack.GetNumModules(); ++i) {
const Telemetry::ProcessedStack::Module &module = aStack.GetModule(i);
if (firstStack.HasModule(module)) {
aStack.RemoveModule(i);

4
xpcom/build/nsXPComInit.cpp
View File

@ -504,10 +504,10 @@ NS_InitXPCOM2(nsIServiceManager* *result,
mozilla::MapsMemoryReporter::Init();
mozilla::HangMonitor::Startup();
mozilla::Telemetry::Init();
mozilla::HangMonitor::Startup();
mozilla::eventtracer::Init();
return NS_OK;