Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Fix nullref in SpecializedNamespace and arg-null ProtocolInfo dict access #451

Merged
jakebailey merged 2 commits into from
Dec 3, 2018
Merged

Fix nullref in SpecializedNamespace and arg-null ProtocolInfo dict access #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93060f3
check _original for null, not its Properties
jakebailey Dec 3, 2018
e78d9d8
also fix this Locations nullref
jakebailey Dec 3, 2018
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
2 changes: 1 addition & 1 deletion src/Analysis/Engine/Impl/Values/ProtocolInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ internal override void AddReference(Node node, AnalysisUnit analysisUnit)

public override IEnumerable<ILocationInfo> Locations {
get {
if (!_references.TryGetValue(DeclaringModule, out var defns)) {
if (DeclaringModule == null || !_references.TryGetValue(DeclaringModule, out var defns)) {
return Enumerable.Empty<ILocationInfo>();
}
return defns.Definitions.Select(l => l.GetLocationInfo()).ExcludeDefault();
Expand Down
6 changes: 3 additions & 3 deletions src/Analysis/Engine/Impl/Values/SpecializedNamespace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ public override bool IsOfType(IAnalysisSet klass) {
return _original.IsOfType(klass);
}

public override IEnumerable<ILocationInfo> Locations => _original?.Locations?.MaybeEnumerate();
public override IEnumerable<ILocationInfo> Locations => _original?.Locations.MaybeEnumerate();

public override string Name => _original == null ? base.Name : _original.Name;

public override IEnumerable<OverloadResult> Overloads =>_original.Overloads.MaybeEnumerate();
public override IEnumerable<OverloadResult> Overloads => _original?.Overloads.MaybeEnumerate();

public override IPythonType PythonType => _original?.PythonType;

internal override IEnumerable<ILocationInfo> References => _original.References?.MaybeEnumerate();
internal override IEnumerable<ILocationInfo> References => _original?.References.MaybeEnumerate();

public override PythonMemberType MemberType => _original == null ? PythonMemberType.Unknown : _original.MemberType;

Expand Down