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 806486 - Instead of setting/unsetting the umask which introduces potential race conditions, chmod the created files instead. r=glandium

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-10-31 10:20:26 -04:00
parent 4be09ba712
commit f41bd071b2
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/base/nsCycleCollector.cpp
View File

@ -132,6 +132,9 @@
#include <io.h>
#include <process.h>
#endif
#ifdef ANDROID
#include <sys/stat.h>
#endif
#ifdef XP_WIN
#include <windows.h>
@ -1564,8 +1567,20 @@ private:
nsresult rv = logFile->AppendNative(filename);
NS_ENSURE_SUCCESS(rv, nullptr);
rv = logFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
rv = logFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0644);
NS_ENSURE_SUCCESS(rv, nullptr);
#ifdef ANDROID
{
// On android the default system umask is 0077 which makes these files
// unreadable to the shell user. In order to pull the dumps off a non-rooted
// device we need to chmod them to something world-readable.
nsAutoCString path;
rv = logFile->GetNativePath(path);
if (NS_SUCCEEDED(rv)) {
chmod(PromiseFlatCString(path).get(), 0644);
}
}
#endif
return logFile.forget();
}

25
xpcom/base/nsMemoryInfoDumper.cpp
View File

@ -31,7 +31,6 @@
#endif
#ifdef ANDROID
#include <sys/types.h>
#include <sys/stat.h>
#endif
@ -505,18 +504,20 @@ nsMemoryInfoDumper::DumpMemoryReportsToFileImpl(
rv = tmpFile->AppendNative(NS_LITERAL_CSTRING("incomplete-") + filename);
NS_ENSURE_SUCCESS(rv, rv);
// XXX This ifdef does not belong here; it should be pushed down into the
// CreateUnique implementation. Please don't copy/paste this elsewhere.
#ifdef ANDROID
// Set umask to 0 while we create the file because on Android the default
// umask is 0077.
mode_t mask = umask(0);
#endif
rv = tmpFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0644);
#ifdef ANDROID
umask(mask);
#endif
rv = tmpFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0644);
NS_ENSURE_SUCCESS(rv, rv);
#ifdef ANDROID
{
// On android the default system umask is 0077 which makes these files
// unreadable to the shell user. In order to pull the dumps off a non-rooted
// device we need to chmod them to something world-readable.
nsAutoCString path;
rv = tmpFile->GetNativePath(path);
if (NS_SUCCEEDED(rv)) {
chmod(PromiseFlatCString(path).get(), 0644);
}
}
#endif
nsRefPtr<nsGZFileWriter> writer = new nsGZFileWriter();
rv = writer->Init(tmpFile);