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

Bug 847492 - Don't special case stdin and stdout. r=BenWa.

Browse Source 
--HG--
extra : rebase_source : 58a609481abcf040ad2a2e6a0971853cac9fe91d
This commit is contained in:
Rafael Ávila de Espíndola 2013-03-04 14:06:19 -05:00
parent 5f8b586dd3
commit 0113db4727
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/build/mozPoisonWriteBase.cpp
View File

@ -76,12 +76,12 @@ void DebugFDAutoLock::Clear() {
static char *sProfileDirectory = NULL;
std::vector<int>& getDebugFDs() {
std::vector<int>* getDebugFDs() {
PR_ASSERT_CURRENT_THREAD_OWNS_LOCK(DebugFDAutoLock::getDebugFDsLock());
// We have to use new as some write happen during static destructors
// so an static std::vector might be destroyed while we still need it.
static std::vector<int> *DebugFDs = new std::vector<int>();
return *DebugFDs;
return DebugFDs;
}
// This a wrapper over a file descriptor that provides a Printf method and
@ -147,8 +147,9 @@ namespace mozilla {
void InitWritePoisoning()
{
// Call to make sure it is initialized.
DebugFDAutoLock::getDebugFDsLock();
// Stdout and Stderr are OK.
MozillaRegisterDebugFD(1);
MozillaRegisterDebugFD(2);
nsCOMPtr<nsIFile> mozFile;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mozFile));
@ -272,7 +273,7 @@ void DisableWritePoisoning() {
PRLock *Lock;
{
DebugFDAutoLock lockedScope;
delete &getDebugFDs();
delete getDebugFDs();
Lock = DebugFDAutoLock::getDebugFDsLock();
DebugFDAutoLock::Clear();
}
@ -290,7 +291,7 @@ bool PoisonWriteEnabled()
bool IsDebugFD(int fd) {
DebugFDAutoLock lockedScope;
std::vector<int> &Vec = getDebugFDs();
std::vector<int> &Vec = *getDebugFDs();
return std::find(Vec.begin(), Vec.end(), fd) != Vec.end();
}
@ -301,7 +302,7 @@ extern "C" {
if (sPoisoningState == POISON_OFF)
return;
DebugFDAutoLock lockedScope;
std::vector<int> &Vec = getDebugFDs();
std::vector<int> &Vec = *getDebugFDs();
MOZ_ASSERT(std::find(Vec.begin(), Vec.end(), fd) == Vec.end());
Vec.push_back(fd);
}
@ -317,7 +318,7 @@ extern "C" {
if (sPoisoningState == POISON_OFF)
return;
DebugFDAutoLock lockedScope;
std::vector<int> &Vec = getDebugFDs();
std::vector<int> &Vec = *getDebugFDs();
std::vector<int>::iterator i = std::find(Vec.begin(), Vec.end(), fd);
MOZ_ASSERT(i != Vec.end());
Vec.erase(i);

4
xpcom/build/mozPoisonWriteMac.cpp
View File

@ -163,10 +163,6 @@ void AbortOnBadWrite(int fd, const void *wbuf, size_t count) {
if (count == 0)
return;
// Stdout and Stderr are OK.
if(fd == 1 || fd == 2)
return;
struct stat buf;
int rv = fstat(fd, &buf);
if (!ValidWriteAssert(rv == 0))