diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2022-07-14 17:01:18 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-07-14 17:01:18 +0200 |
commit | f07a6606e44d7bba88efa55615075a917704bde1 (patch) | |
tree | 2cd1a002188fcae9bc0797dc6f58b46546d13bdc /libbutl/builtin.cxx | |
parent | fd02ec768ea360ca8d1a4a1da33bd0fef42d0653 (diff) |
Set builtin result while holding mutex
While the original code was probably correct, there is suspicion this
is causing a TSAN false-positive.
Diffstat (limited to 'libbutl/builtin.cxx')
-rw-r--r-- | libbutl/builtin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbutl/builtin.cxx b/libbutl/builtin.cxx index b13a59a..6f451bf 100644 --- a/libbutl/builtin.cxx +++ b/libbutl/builtin.cxx @@ -2177,17 +2177,17 @@ namespace butl { unique_ptr<builtin::async_state> s ( new builtin::async_state ( + r, [fn, - &r, &args, in = move (in), out = move (out), err = move (err), &cwd, - &cbs] () mutable noexcept + &cbs] () mutable noexcept -> uint8_t { - r = fn (args, - move (in), move (out), move (err), - cwd, - cbs); + return fn (args, + move (in), move (out), move (err), + cwd, + cbs); })); return builtin (r, move (s)); |