Backed out changeset ebe866ff8a44 (bug 1041775)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 20 Nov 2014 16:11:06 +0100
changeset 216649 a500a8bf99f9b7d97ab9c662c798c134702f5bee
parent 216648 c7c492d4f480b0e09d4c6055bb66e632aacb5cab
child 216650 87b02835d654c759eae4b9283b8de0a0fd896380
push id27858
push userkwierso@gmail.com
push dateFri, 21 Nov 2014 01:35:46 +0000
treeherdermozilla-central@6309710dd71d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1041775
milestone36.0a1
backs outebe866ff8a445ddd36b471621ced3ee8015706a2
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ebe866ff8a44 (bug 1041775)
security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
security/sandbox/win/src/broker_services.cc
--- a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
+++ b/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
@@ -1,5 +1,5 @@
 Please add a link to the bugzilla bug and patch name that should be re-applied.
 Also, please update any existing links to their actual mozilla-central changeset.
 
+https://hg.mozilla.org/mozilla-central/rev/f94a07671389
 https://bugzilla.mozilla.org/show_bug.cgi?id=1041775 bug1041775part2.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=1041775 bug1041775part3.patch
--- a/security/sandbox/win/src/broker_services.cc
+++ b/security/sandbox/win/src/broker_services.cc
@@ -440,24 +440,16 @@ ResultCode BrokerServicesBase::SpawnTarg
       startup_info.startup_info()->dwFlags |= STARTF_USESTDHANDLES;
       startup_info.startup_info()->hStdInput = INVALID_HANDLE_VALUE;
       startup_info.startup_info()->hStdOutput = stdout_handle;
       startup_info.startup_info()->hStdError = stderr_handle;
       // Allowing inheritance of handles is only secure now that we
       // have limited which handles will be inherited.
       inherit_handles = true;
     }
-  } else if (getenv("MOZ_WIN_INHERIT_STD_HANDLES_PRE_VISTA")) {
-    // On pre-Vista versions even if we can't limit what gets inherited, we
-    // sometimes want to inherit stdout/err for testing purposes.
-    startup_info.startup_info()->dwFlags |= STARTF_USESTDHANDLES;
-    startup_info.startup_info()->hStdInput = INVALID_HANDLE_VALUE;
-    startup_info.startup_info()->hStdOutput = policy_base->GetStdoutHandle();
-    startup_info.startup_info()->hStdError = policy_base->GetStderrHandle();
-    inherit_handles = true;
   }
 
   // Construct the thread pool here in case it is expensive.
   // The thread pool is shared by all the targets
   if (NULL == thread_pool_)
     thread_pool_ = new Win2kThreadPool();
 
   // Create the TargetProces object and spawn the target suspended. Note that