From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- ipc/glue/ForkServiceChild.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ipc/glue/ForkServiceChild.cpp') diff --git a/ipc/glue/ForkServiceChild.cpp b/ipc/glue/ForkServiceChild.cpp index 65560dfaea..09d7c48457 100644 --- a/ipc/glue/ForkServiceChild.cpp +++ b/ipc/glue/ForkServiceChild.cpp @@ -3,11 +3,13 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #include "ForkServiceChild.h" #include "ForkServer.h" -#include "mozilla/ipc/IPDLParamTraits.h" +#include "mozilla/Atomics.h" #include "mozilla/Logging.h" #include "mozilla/ipc/GeckoChildProcessHost.h" +#include "mozilla/ipc/IPDLParamTraits.h" #include "mozilla/ipc/ProtocolMessageUtils.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/Services.h" @@ -23,6 +25,7 @@ namespace ipc { extern LazyLogModule gForkServiceLog; mozilla::UniquePtr ForkServiceChild::sForkServiceChild; +Atomic ForkServiceChild::sForkServiceUsed; static bool ConfigurePipeFd(int aFd) { int flags = fcntl(aFd, F_GETFD, 0); @@ -55,6 +58,7 @@ void ForkServiceChild::StartForkServer() { return; } + sForkServiceUsed = true; sForkServiceChild = mozilla::MakeUnique(server.release(), subprocess); } -- cgit v1.2.3