ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-04 13:19:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6046 from urbit/lf/fix-cork

Browse Source 
ames: prevent crashes when corking an alien flow
This commit is contained in:
jose 2022-11-15 08:43:46 +01:00 committed by GitHub
commit 1b4f045499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/arvo/sys/vane/ames.hoon
View File

@ -1777,14 +1777,16 @@
++ on-cork ++ on-cork
|= =ship |= =ship
^+ event-core ^+ event-core
=/ =plea [%$ /flow [%cork ~]]
=/ ship-state (~(get by peers.ames-state) ship) =/ ship-state (~(get by peers.ames-state) ship)
:: ?. ?=([~ %known *] ship-state)
?> ?=([~ %known *] ship-state) %+ enqueue-alien-todo ship
|= todos=alien-agenda
todos(messages [[duct plea] messages.todos])
=/ =peer-state +.u.ship-state =/ =peer-state +.u.ship-state
=/ =channel [[our ship] now channel-state -.peer-state] =/ =channel [[our ship] now channel-state -.peer-state]
:: ::
=^ =bone ossuary.peer-state (bind-duct ossuary.peer-state duct) =^ =bone ossuary.peer-state (bind-duct ossuary.peer-state duct)
=/ =plea [%$ /flow [%cork ~]]
:: ::
=. closing.peer-state (~(put in closing.peer-state) bone) =. closing.peer-state (~(put in closing.peer-state) bone)
%- %^ trace msg.veb ship %- %^ trace msg.veb ship
@ -2058,6 +2060,8 @@
=. event-core =. event-core
%+ reel messages.todos %+ reel messages.todos
|= [[=^duct =plea] core=_event-core] |= [[=^duct =plea] core=_event-core]
?: ?=(%$ -.plea)
(on-cork:core(duct duct) ship)
(on-plea:core(duct duct) ship plea) (on-plea:core(duct duct) ship plea)
:: apply outgoing packet blobs :: apply outgoing packet blobs
:: ::