Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 440840 - "mailcap handling may fail due to race conditions between thread waiting and system()" [p=mh+mozilla@glandium.org (Mike Hommey) r+sr=bzbarsky]

Browse Source
This commit is contained in:
Mike Hommey 2008-07-12 03:46:11 -05:00
parent 08111f0fdc
commit ac5f9d631e
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
uriloader/exthandler/unix/nsOSHelperAppService.cpp
View File

@ -67,7 +67,6 @@
#include "nsDirectoryServiceUtils.h"
#include "prenv.h" // for PR_GetEnv()
#include "nsAutoPtr.h"
#include <stdlib.h> // for system()
#define LOG(args) PR_LOG(mLog, PR_LOG_DEBUG, args)
#define LOG_ENABLED() PR_LOG_TEST(mLog, PR_LOG_DEBUG)
@ -1141,9 +1140,32 @@ nsOSHelperAppService::GetHandlerAndDescriptionFromMailcapFile(const nsAString& a
aMinorType,
aTypeOptions,
testCommand);
if (NS_FAILED(rv))
continue;
nsCOMPtr<nsIProcess> process = do_CreateInstance(NS_PROCESS_CONTRACTID, &rv);
if (NS_FAILED(rv))
continue;
nsCOMPtr<nsILocalFile> file(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv));
if (NS_FAILED(rv))
continue;
rv = file->InitWithNativePath(NS_LITERAL_CSTRING("/bin/sh"));
if (NS_FAILED(rv))
continue;
rv = process->Init(file);
if (NS_FAILED(rv))
continue;
const char *args[] = { "-c", testCommand.get() };
LOG(("Running Test: %s\n", testCommand.get()));
// XXX this should not use system(), since that can block the UI thread!
if (NS_SUCCEEDED(rv) && system(testCommand.get()) != 0) {
PRUint32 pid;
rv = process->Run(PR_TRUE, args, 2, &pid);
if (NS_FAILED(rv))
continue;
PRInt32 exitValue;
rv = process->GetExitValue(&exitValue);
if (NS_FAILED(rv))
continue;
LOG(("Exit code: %d\n", exitValue));
if (exitValue) {
match = PR_FALSE;
}
}