cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate off base::ThreadPool()-as-a-trait in /services/device

Browse Source 
6ddec2fbc4

Fixes SEGV when using FIDO keys.

ok robert@
This commit is contained in:
gnezdo 2020-06-21 15:49:36 +00:00
parent e2509cc689
commit 271300ed3a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/chromium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.517 2020/06/16 19:21:53 robert Exp $
# $OpenBSD: Makefile,v 1.518 2020/06/21 15:49:36 gnezdo Exp $
.include <bsd.port.arch.mk>
@ -13,6 +13,7 @@ DPB_PROPERTIES= lonesome
COMMENT= Chromium browser
V= 83.0.4103.106
REVISION= 0
DISTNAME= chromium-${V}

7
www/chromium/files/hid_service_fido.cc
View File

@ -27,6 +27,7 @@ extern "C" {
#include "base/location.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/thread_pool.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/pattern.h"
@ -49,8 +50,8 @@ struct ConnectParams {
HidService::ConnectCallback callback)
: device_info(std::move(device_info)), callback(std::move(callback)),
task_runner(base::ThreadTaskRunnerHandle::Get()),
blocking_task_runner(
base::CreateSequencedTaskRunner(HidService::kBlockingTaskTraits)) {}
blocking_task_runner(base::ThreadPool::CreateSequencedTaskRunner(
HidService::kBlockingTaskTraits)) {}
~ConnectParams() {}
scoped_refptr<HidDeviceInfo> device_info;
@ -281,7 +282,7 @@ private:
HidServiceFido::HidServiceFido()
: task_runner_(base::ThreadTaskRunnerHandle::Get()),
blocking_task_runner_(
base::CreateSequencedTaskRunner(kBlockingTaskTraits)),
base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)),
weak_factory_(this), helper_(std::make_unique<BlockingTaskHelper>(
weak_factory_.GetWeakPtr())) {
blocking_task_runner_->PostTask(