From: Eric Wong Date: Thu, 4 Feb 2021 09:59:22 +0000 (-0900) Subject: ipc: localize fields assignment X-Git-Tag: v1.7.0~1211 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=a93947277940b9b4a22a21f70166703fe69198df;p=public-inbox.git ipc: localize fields assignment We don't want circular references giving surprising behavior during worker exit. --- diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm index 3873649b..078aaa2c 100644 --- a/lib/PublicInbox/IPC.pm +++ b/lib/PublicInbox/IPC.pm @@ -338,7 +338,6 @@ sub _wq_worker_start ($$$) { srand($seed); eval { PublicInbox::DS->Reset }; delete @$self{qw(-wq_s1 -wq_workers -wq_ppid)}; - @$self{keys %$fields} = values(%$fields) if $fields; $SIG{$_} = 'IGNORE' for (qw(PIPE)); $SIG{$_} = 'DEFAULT' for (qw(TTOU TTIN TERM QUIT INT CHLD)); local $0 = $self->{-wq_ident}; @@ -346,6 +345,8 @@ sub _wq_worker_start ($$$) { # ensure we properly exit even if warn() dies: my $end = PublicInbox::OnDestroy->new($$, sub { exit(!!$@) }); eval { + $fields //= {}; + local @$self{keys %$fields} = values(%$fields); my $on_destroy = $self->ipc_atfork_child; local %SIG = %SIG; wq_worker_loop($self);