Skip to content

Add null check on Weak.resolve #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Speedphoenix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add null check on Weak.resolve #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions hxbit/NetworkHost.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,9 @@ class NetworkHost {
}
var o = markHead;
while( o != null ) {
var next = o.__next;
o.__next = null;
if( markHead == o ) markHead = null;
if( (o.__bits1|o.__bits2 #if hxbit_visibility | o.__dirtyVisibilityGroups #end) != 0 ) {
if( logger != null ) {
var props = [];
Expand Down Expand Up @@ -1269,9 +1272,10 @@ class NetworkHost {
o.__dirtyVisibilityGroups = 0;
#end
}
var n = o.__next;
o.__next = null;
o = n;
o = next;
// var n = o.__next;
// o.__next = null;
// o = n;
}
markHead = null;
}
Expand Down
2 changes: 2 additions & 0 deletions hxbit/Weak.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ abstract Weak<T:NetworkSerializable>(UID) {
}
static function resolve( uid : UID ) : Dynamic {
var host = NetworkHost.current;
if (host == null)
return null;
var r = @:privateAccess host.globalCtx.refs.get(uid);
if( r == null ) {
var h = @:privateAccess host.registerHead;
Expand Down