Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1316527 - Return 0 when GetSerialNumber fails to find an existing serial number. r=froydnj

Browse Source 
NS_LogCOMPtrAddRef and NS_LogCOMPtrRelease always pass false to
GetSerialNumber, because they pass in everything they get without
regard to whether it is being logged or not, so they don't want to
create a serial number if none exists. This causes the assertions
added in bug 1309051 to be hit. To work around this, I hoist the
assertion into the other callers of this method. Two of them already
had this check, but it was non-fatal.

This also makes the asserts not happen in release builds, as I decided
it doesn't really matter what happens if somebody tries to use it
there.

--HG--
extra : rebase_source : 5e70290492fd442b79b4d40c300a263e322f485b
This commit is contained in:
Andrew McCreight 2016-11-16 12:38:54 -08:00
parent 695e85fecd
commit 7f15cf986b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xpcom/base/nsTraceRefcnt.cpp
View File

@ -574,8 +574,6 @@ HashNumber(const void* aKey)
return PLHashNumber(NS_PTR_TO_INT32(aKey));
}
// This method uses MOZ_RELEASE_ASSERT in the unlikely event that
// somebody uses this in a non-debug build.
static intptr_t
GetSerialNumber(void* aPtr, bool aCreate)
{
@ -587,7 +585,9 @@ GetSerialNumber(void* aPtr, bool aCreate)
return static_cast<SerialNumberRecord*>((*hep)->value)->serialNumber;
}
MOZ_RELEASE_ASSERT(aCreate, "If an object does not have a serial number, we should be creating it.");
if (!aCreate) {
return 0;
}
SerialNumberRecord* record = new SerialNumberRecord();
WalkTheStackSavingLocations(record->allocationStack);
@ -1053,9 +1053,9 @@ NS_LogAddRef(void* aPtr, nsrefcnt aRefcnt,
intptr_t serialno = 0;
if (gSerialNumbers && loggingThisType) {
serialno = GetSerialNumber(aPtr, aRefcnt == 1);
NS_ASSERTION(serialno != 0,
"Serial number requested for unrecognized pointer! "
"Are you memmoving a refcounted object?");
MOZ_ASSERT(serialno != 0,
"Serial number requested for unrecognized pointer! "
"Are you memmoving a refcounted object?");
int32_t* count = GetRefCount(aPtr);
if (count) {
(*count)++;
@ -1103,9 +1103,9 @@ NS_LogRelease(void* aPtr, nsrefcnt aRefcnt, const char* aClass)
intptr_t serialno = 0;
if (gSerialNumbers && loggingThisType) {
serialno = GetSerialNumber(aPtr, false);
NS_ASSERTION(serialno != 0,
"Serial number requested for unrecognized pointer! "
"Are you memmoving a refcounted object?");
MOZ_ASSERT(serialno != 0,
"Serial number requested for unrecognized pointer! "
"Are you memmoving a refcounted object?");
int32_t* count = GetRefCount(aPtr);
if (count) {
(*count)--;
@ -1162,6 +1162,7 @@ NS_LogCtor(void* aPtr, const char* aType, uint32_t aInstanceSize)
intptr_t serialno = 0;
if (gSerialNumbers && loggingThisType) {
serialno = GetSerialNumber(aPtr, true);
MOZ_ASSERT(serialno != 0, "GetSerialNumber should never return 0 when passed true");
}
bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
@ -1198,6 +1199,9 @@ NS_LogDtor(void* aPtr, const char* aType, uint32_t aInstanceSize)
intptr_t serialno = 0;
if (gSerialNumbers && loggingThisType) {
serialno = GetSerialNumber(aPtr, false);
MOZ_ASSERT(serialno != 0,
"Serial number requested for unrecognized pointer! "
"Are you memmoving a MOZ_COUNT_CTOR-tracked object?");
RecycleSerialNumberPtr(aPtr);
}