Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 11:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1251895 - don't race on nsTraceRefcnt's object serial number tables; r=mccr8

Browse Source 
GetSerialNumber accesses global state through gSerialNumbers.  We call
GetSerialNumber under a lock when doing normal object refcount logging.
However, we call GetSerialNumber outside of a lock when we're tracing
individual classes for nsCOMPtr refcount logging, even if we don't
actually care about nsCOMPtr refcount logging.  We should call it under
a lock always.
This commit is contained in:
Nathan Froyd 2016-02-29 15:04:36 -05:00
parent 2f82f5bc02
commit 4074e6e3f7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xpcom/base/nsTraceRefcnt.cpp
View File

@ -1283,17 +1283,17 @@ NS_LogCOMPtrAddRef(void* aCOMPtr, nsISupports* aObject)
if (!gTypesToLog || !gSerialNumbers) {
return;
}
intptr_t serialno = GetSerialNumber(object, false);
if (serialno == 0) {
return;
}
if (!gInitialized) {
InitTraceLog();
}
if (gLogging == FullLogging) {
AutoTraceLogLock lock;
intptr_t serialno = GetSerialNumber(object, false);
if (serialno == 0) {
return;
}
int32_t* count = GetCOMPtrCount(object);
if (count) {
(*count)++;
@ -1324,17 +1324,17 @@ NS_LogCOMPtrRelease(void* aCOMPtr, nsISupports* aObject)
if (!gTypesToLog || !gSerialNumbers) {
return;
}
intptr_t serialno = GetSerialNumber(object, false);
if (serialno == 0) {
return;
}
if (!gInitialized) {
InitTraceLog();
}
if (gLogging == FullLogging) {
AutoTraceLogLock lock;
intptr_t serialno = GetSerialNumber(object, false);
if (serialno == 0) {
return;
}
int32_t* count = GetCOMPtrCount(object);
if (count) {
(*count)--;